Messages in this thread Patch in this message | | | Date | Sat, 9 May 2015 22:00:51 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT pull] timer updates for 4.1-rc3 |
| |
Linus,
please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
A simple fix to actually shut down a detached device instead of letting it active.
Thanks,
tglx
------------------> Viresh Kumar (1): clockevents: Shutdown detached clockevent device
kernel/time/clockevents.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 25d942d1da27..629be4e21e96 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);
| |