Commit-ID: 7407188489c62a7b5694bc75a6db2b82af94c9a5
Gitweb: https://git.kernel.org/tip/7407188489c62a7b5694bc75a6db2b82af94c9a5
Author: Anson Huang <[email protected]>
AuthorDate: Thu, 19 Apr 2018 14:04:43 +0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Thu, 19 Apr 2018 13:21:35 +0200
clocksource/imx-tpm: Correct -ETIME return condition check
The additional brakects added to tpm_set_next_event's return value
computation causes (int) forced type conversion NOT taking effect, and the
incorrect value return will cause various system timer issue, like RCU
stall etc..
Remove the additional brackets to make sure tpm_set_next_event always
returns correct value.
Fixes: 059ab7b82eec ("clocksource/drivers/imx-tpm: Add imx tpm timer support")
Signed-off-by: Anson Huang <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Acked-by: Dong Aisheng <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link:
https://lkml.kernel.org/r/[email protected]
---
drivers/clocksource/timer-imx-tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/timer-imx-tpm.c
b/drivers/clocksource/timer-imx-tpm.c
index 05d97a6871d8..6c8318470b48 100644
--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -114,7 +114,7 @@ static int tpm_set_next_event(unsigned long delta,
* of writing CNT registers which may cause the min_delta event got
* missed, so we need add a ETIME check here in case it happened.
*/
- return (int)((next - now) <= 0) ? -ETIME : 0;
+ return (int)(next - now) <= 0 ? -ETIME : 0;
}
static int tpm_set_state_oneshot(struct clock_event_device *evt)
