diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-02 12:34:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 09:21:51 -0800 |
| commit | 7a2d10ca36b5f50f5c34604c2c3c8bf371cb884f (patch) | |
| tree | 1b3812ba44cd51dcdb5dfbad67bd32d8bb1c77d8 | |
| parent | 2a96fb69ba383c2d3923456d1e933ba4950eb4c5 (diff) | |
| download | linux-stable-7a2d10ca36b5f50f5c34604c2c3c8bf371cb884f.tar.gz linux-stable-7a2d10ca36b5f50f5c34604c2c3c8bf371cb884f.tar.bz2 linux-stable-7a2d10ca36b5f50f5c34604c2c3c8bf371cb884f.zip | |
tick-broadcast: Stop active broadcast device when replacing it
commit c1be84309c58b1e7c6d626e28fba41a22b364c3d upstream.
When a better rated broadcast device is installed, then the current
active device is not disabled, which results in two running broadcast
devices.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/time/tick-broadcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 8917fd3b0ed5..57b953f1d42c 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c @@ -72,7 +72,7 @@ int tick_check_broadcast_device(struct clock_event_device *dev) (dev->features & CLOCK_EVT_FEAT_C3STOP)) return 0; - clockevents_exchange_device(NULL, dev); + clockevents_exchange_device(tick_broadcast_device.evtdev, dev); tick_broadcast_device.evtdev = dev; if (!cpumask_empty(tick_get_broadcast_mask())) tick_broadcast_start_periodic(dev); |