Commit 95f3b1f4 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1a9f064f 149aabcc
...@@ -117,11 +117,7 @@ static int __clockevents_set_state(struct clock_event_device *dev, ...@@ -117,11 +117,7 @@ static int __clockevents_set_state(struct clock_event_device *dev,
/* Transition with new state-specific callbacks */ /* Transition with new state-specific callbacks */
switch (state) { switch (state) {
case CLOCK_EVT_STATE_DETACHED: case CLOCK_EVT_STATE_DETACHED:
/* /* The clockevent device is getting replaced. Shut it down. */
* This is an internal state, which is guaranteed to go from
* SHUTDOWN to DETACHED. No driver interaction required.
*/
return 0;
case CLOCK_EVT_STATE_SHUTDOWN: case CLOCK_EVT_STATE_SHUTDOWN:
return dev->set_state_shutdown(dev); return dev->set_state_shutdown(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment