Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/time/clockevents.c

+1 −5
Original line number Diff line number Diff line
@@ -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);