projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/mpc512x', 'spi/topic...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clocksource
/
sh_mtu2.c
diff --git
a/drivers/clocksource/sh_mtu2.c
b/drivers/clocksource/sh_mtu2.c
index f1985da8113f481fb870c4b91eeef62b962300ad..53aa7e92a7d77b7efc052466e8904efc110cc2eb 100644
(file)
--- a/
drivers/clocksource/sh_mtu2.c
+++ b/
drivers/clocksource/sh_mtu2.c
@@
-280,7
+280,9
@@
static int sh_mtu2_clock_event_shutdown(struct clock_event_device *ced)
{
struct sh_mtu2_channel *ch = ced_to_sh_mtu2(ced);
- sh_mtu2_disable(ch);
+ if (clockevent_state_periodic(ced))
+ sh_mtu2_disable(ch);
+
return 0;
}