diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-02 12:34:16 +0100 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-16 16:45:01 -0500 |
| commit | 675be1e1dacca2ade17771af82b8c948579a080b (patch) | |
| tree | 9d9ff450484e5e0f8ee0eff3391787b83d6e23cb | |
| parent | 8844a98f2d95682ab4c71180e2e599cdb888ae7d (diff) | |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
| -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 0f888cb837c..521987f8587 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); |