aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-12-02 12:34:16 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 08:52:48 -0800
commitd80dee54533aa4bfe29def921edb31715fdba214 (patch)
treef509a1896113dc10a0288052bbee448682f387d6 /kernel/time
parenteda31b190f7c7033b86ff6e8de3866a4ca25b7df (diff)
downloadkernel_samsung_crespo-d80dee54533aa4bfe29def921edb31715fdba214.zip
kernel_samsung_crespo-d80dee54533aa4bfe29def921edb31715fdba214.tar.gz
kernel_samsung_crespo-d80dee54533aa4bfe29def921edb31715fdba214.tar.bz2
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>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-broadcast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index c7218d1..7a90d02 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -71,7 +71,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);