Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "A single fix to make the cs5535 clock event driver robust agaist spurious interrupts" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clockevents/drivers/cs5535: Improve resilience to spurious interrupts
This commit is contained in:
commit
9e415a8edc
|
@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)
|
||||||
/* Turn off the clock (and clear the event) */
|
/* Turn off the clock (and clear the event) */
|
||||||
disable_timer(cs5535_event_clock);
|
disable_timer(cs5535_event_clock);
|
||||||
|
|
||||||
if (clockevent_state_shutdown(&cs5535_clockevent))
|
if (clockevent_state_detached(&cs5535_clockevent) ||
|
||||||
|
clockevent_state_shutdown(&cs5535_clockevent))
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
|
|
||||||
/* Clear the counter */
|
/* Clear the counter */
|
||||||
|
|
Loading…
Reference in New Issue