diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
| commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
| tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /kernel/time/clockevents.c | |
| parent | de8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff) | |
| parent | 086e8ddb567951513a5dace21a09297768aee14f (diff) | |
| download | linux-stable-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.gz linux-stable-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.bz2 linux-stable-9f61f62544747db5d5c590bfae9dd19f1337e421.zip | |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'kernel/time/clockevents.c')
| -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); |