[PATCH 4.16 06/26] clocksource/imx-tpm: Correct -ETIME return condition check

From: Greg Kroah-Hartman
Date: Wed Apr 25 2018 - 06:35:01 EST


4.16-stable review patch. If anyone has any objections, please let me know.

------------------

From: Anson Huang <Anson.Huang@xxxxxxx>

commit 7407188489c62a7b5694bc75a6db2b82af94c9a5 upstream.

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 <Anson.Huang@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Dong Aisheng <Aisheng.dong@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Cc: daniel.lezcano@xxxxxxxxxx
Cc: Linux-imx@xxxxxxx
Link: https://lkml.kernel.org/r/1524117883-2484-1-git-send-email-Anson.Huang@xxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/clocksource/timer-imx-tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/clocksource/timer-imx-tpm.c
+++ b/drivers/clocksource/timer-imx-tpm.c
@@ -105,7 +105,7 @@ static int tpm_set_next_event(unsigned l
* 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)