summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-05-19 08:37:30 +0200
committerIngo Molnar <mingo@kernel.org>2015-05-19 08:37:30 +0200
commita22ae718067c233af790b8690b3d8f6190859ead (patch)
tree2e96c72b4b231f9302f0000a8702e4f21456e90b /kernel/time
parent58ac93e4f2e4b15beffdf0e3749b7fea3208ef66 (diff)
parente26081808edadfd257c6c9d81014e3b25e9a6118 (diff)
downloadlinux-a22ae718067c233af790b8690b3d8f6190859ead.tar.bz2
Merge tag 'v4.1-rc4' into sched/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-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);