Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74071884 authored by Anson Huang's avatar Anson Huang Committed by Thomas Gleixner
Browse files

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: 059ab7b8 ("clocksource/drivers/imx-tpm: Add imx tpm timer support")
Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDong Aisheng <Aisheng.dong@nxp.com>
Cc: stable@vger.kernel.org
Cc: daniel.lezcano@linaro.org
Cc: Linux-imx@nxp.com
Link: https://lkml.kernel.org/r/1524117883-2484-1-git-send-email-Anson.Huang@nxp.com
parent c3bca5d4

drivers/clocksource/timer-imx-tpm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)