Merge tag 'for-f2fs-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[karo-tx-linux.git] / drivers / clocksource / sh_tmu.c

diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 43c98143f79a5b4a650244dfcf13b40ea779ba7d..469e776ec17a5a2cf4528cc41c58d5542b9a0d53 100644 (file)
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -362,7 +362,8 @@ static int sh_tmu_clock_event_shutdown(struct clock_event_device *ced)
 {
        struct sh_tmu_channel *ch = ced_to_sh_tmu(ced);
 
-       sh_tmu_disable(ch);
+       if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced))
+               sh_tmu_disable(ch);
        return 0;
 }