bus: ti-sysc: Fix error handling for sysc_check_active_timer()
Tony Lindgren
maintainerPATCH 1/1 bus: ti-sysc: Fix error handling for sysc_check_active_timer()
We have changed the return type for sysc_check_active_timer() from -EBUSY to -ENXIO, but the gpt12 system timer fix still checks for -EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.
Commit 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source").
Let's fix the issue by checking for -ENXIO and returning on any other errors as suggested by Pavel Machek <[email protected]>.
Depends-on: 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source")
--- drivers/bus/ti-sysc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bus/ti-sysc.c +3 -1
@@ -3097,8 +3097,10 @@ static int sysc_probe(struct platform_device *pdev)return error; error =sysc_check_active_timer (ddata); -if (error == -EBUSY ) +if (error == -ENXIO ) ddata->reserved = true; +else if (error) +return error; error =sysc_get_clocks (ddata);if (error)
Signature · 1 line
2.32.0
Quoted 12 lines · Tony Lindgren
We have changed the return type for
sysc_check_active_timer()from-EBUSYto-ENXIO, but the gpt12 system timer fix still checks for-EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.Commit
3ff340e24c9d("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit65fb73676112("bus: ti-sysc: suppress err msg for timers used as clockevent/source").Let's fix the issue by checking for
-ENXIOand returning on any other errors as suggested by Pavel Machek <[email protected]>.
Quoted 6 lines
Fixes 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status")Depends-on:
65fb73676112("bus: ti-sysc: suppress err msg for timers used as clockevent/source")Reported-by Pavel Machek <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Jarkko Nikula
Tested-byHi
Quoted 13 lines · Pavel Machek
Quoted 12 lines · Tony Lindgren
We have changed the return type for
sysc_check_active_timer()from-EBUSYto-ENXIO, but the gpt12 system timer fix still checks for-EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.Commit
3ff340e24c9d("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit65fb73676112("bus: ti-sysc: suppress err msg for timers used as clockevent/source").Let's fix the issue by checking for
-ENXIOand returning on any other errors as suggested by Pavel Machek <[email protected]>.
Quoted 9 lines
Quoted 6 lines
Fixes 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status")Depends-on:
65fb73676112("bus: ti-sysc: suppress err msg for timers used as clockevent/source")Reported-by Pavel Machek <[email protected]>Cc Grygorii Strashko <[email protected]>Cc Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Reviewed-by Pavel Machek (CIP) <[email protected]>
I double checked but actually both plain 0aa78d17099b ("Merge tag 'scsi-fixes' ofgit://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") and with this patch boot fine on my Beagle C2.
Anyway,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tony Lindgren
maintainerQuoted 8 lines · Jarkko Nikula
I double checked but actually both plain
0aa78d17099b("Merge tag 'scsi-fixes' ofgit://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") and with this patch boot fine on my Beagle C2.Anyway,
Tested-by [email protected]
OK thanks for testing. I had already pushed out my fixes branch so I did not want to go back to add the Tested-by. Anyways, a pull request for this has been sent now.
Regards,
Tony