diff options
Diffstat (limited to 'kernel/time/tick-broadcast.c')
-rw-r--r-- | kernel/time/tick-broadcast.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 8001d37071f5..8339af229cb9 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
@@ -49,7 +49,7 @@ cpumask_t *tick_get_broadcast_mask(void) | |||
49 | */ | 49 | */ |
50 | static void tick_broadcast_start_periodic(struct clock_event_device *bc) | 50 | static void tick_broadcast_start_periodic(struct clock_event_device *bc) |
51 | { | 51 | { |
52 | if (bc && bc->mode == CLOCK_EVT_MODE_SHUTDOWN) | 52 | if (bc) |
53 | tick_setup_periodic(bc, 1); | 53 | tick_setup_periodic(bc, 1); |
54 | } | 54 | } |
55 | 55 | ||
@@ -299,7 +299,7 @@ void tick_suspend_broadcast(void) | |||
299 | spin_lock_irqsave(&tick_broadcast_lock, flags); | 299 | spin_lock_irqsave(&tick_broadcast_lock, flags); |
300 | 300 | ||
301 | bc = tick_broadcast_device.evtdev; | 301 | bc = tick_broadcast_device.evtdev; |
302 | if (bc && tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC) | 302 | if (bc) |
303 | clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN); | 303 | clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN); |
304 | 304 | ||
305 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); | 305 | spin_unlock_irqrestore(&tick_broadcast_lock, flags); |
@@ -316,6 +316,8 @@ int tick_resume_broadcast(void) | |||
316 | bc = tick_broadcast_device.evtdev; | 316 | bc = tick_broadcast_device.evtdev; |
317 | 317 | ||
318 | if (bc) { | 318 | if (bc) { |
319 | clockevents_set_mode(bc, CLOCK_EVT_MODE_RESUME); | ||
320 | |||
319 | switch (tick_broadcast_device.mode) { | 321 | switch (tick_broadcast_device.mode) { |
320 | case TICKDEV_MODE_PERIODIC: | 322 | case TICKDEV_MODE_PERIODIC: |
321 | if(!cpus_empty(tick_broadcast_mask)) | 323 | if(!cpus_empty(tick_broadcast_mask)) |