aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 14:57:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-09 14:57:49 -0700
commit95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7 (patch)
tree4a24c1556fd1c52cb4e73eb2eca60de6306e4349
parent1a9f064f516c36d018754407b41921c996439ecf (diff)
parent149aabcc44e3e2c1f8fe4f0832be53d2db55b598 (diff)
downloadlinux-stericsson-95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7.tar.gz
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "A simple fix to actually shut down a detached device instead of keeping it active" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clockevents: Shutdown detached clockevent device
-rw-r--r--kernel/time/clockevents.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 11dc22a6983b..637a09461c1d 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -117,11 +117,7 @@ static int __clockevents_set_state(struct clock_event_device *dev,
/* Transition with new state-specific callbacks */
switch (state) {
case CLOCK_EVT_STATE_DETACHED:
- /*
- * This is an internal state, which is guaranteed to go from
- * SHUTDOWN to DETACHED. No driver interaction required.
- */
- return 0;
+ /* The clockevent device is getting replaced. Shut it down. */
case CLOCK_EVT_STATE_SHUTDOWN:
return dev->set_state_shutdown(dev);