diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-02 06:34:16 -0500 |
|---|---|---|
| committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2011-12-12 08:07:10 -0500 |
| commit | b9cb8ed45b521b5f805c82c4e36c22df10a797fe (patch) | |
| tree | ed15c88baed64a6e8aa50260c68c6a2126080f51 /kernel | |
| parent | d43fcb754e92c0330679cfc59cbb9bec482a3c43 (diff) | |
tick-broadcast: Stop active broadcast device when replacing it
BugLink: http://bugs.launchpad.net/bugs/902312
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'kernel')
| -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 c7218d13273..7a90d021b79 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) | |||
| 71 | (dev->features & CLOCK_EVT_FEAT_C3STOP)) | 71 | (dev->features & CLOCK_EVT_FEAT_C3STOP)) |
| 72 | return 0; | 72 | return 0; |
| 73 | 73 | ||
| 74 | clockevents_exchange_device(NULL, dev); | 74 | clockevents_exchange_device(tick_broadcast_device.evtdev, dev); |
| 75 | tick_broadcast_device.evtdev = dev; | 75 | tick_broadcast_device.evtdev = dev; |
| 76 | if (!cpumask_empty(tick_get_broadcast_mask())) | 76 | if (!cpumask_empty(tick_get_broadcast_mask())) |
| 77 | tick_broadcast_start_periodic(dev); | 77 | tick_broadcast_start_periodic(dev); |