diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 23:57:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 23:57:49 +0200 |
| commit | 95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7 (patch) | |
| tree | 4a24c1556fd1c52cb4e73eb2eca60de6306e4349 /kernel | |
| parent | m32r: make flush_cpumask non-volatile. (diff) | |
| parent | clockevents: Shutdown detached clockevent device (diff) | |
| download | linux-95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7.tar.xz linux-95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clockevents.c | 6 |
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); |