diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-22 06:56:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-22 06:56:25 -0400 |
| commit | 9e415a8edce53fb0fed28e15bc06522d122e872e (patch) | |
| tree | c0f1ed6250d593ad4584dd4c54f4dd5e2c003802 | |
| parent | 5670a8471e27ff400e9446b5bab6c296c8d8a733 (diff) | |
| parent | eb39a7c0355393c5a8d930f342ad7a6231b552c4 (diff) | |
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
| -rw-r--r-- | drivers/clocksource/cs5535-clockevt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c index a1df588343f2..1de8cac99a0e 100644 --- a/drivers/clocksource/cs5535-clockevt.c +++ b/drivers/clocksource/cs5535-clockevt.c | |||
| @@ -117,7 +117,8 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id) | |||
| 117 | /* Turn off the clock (and clear the event) */ | 117 | /* Turn off the clock (and clear the event) */ |
| 118 | disable_timer(cs5535_event_clock); | 118 | disable_timer(cs5535_event_clock); |
| 119 | 119 | ||
| 120 | if (clockevent_state_shutdown(&cs5535_clockevent)) | 120 | if (clockevent_state_detached(&cs5535_clockevent) || |
| 121 | clockevent_state_shutdown(&cs5535_clockevent)) | ||
| 121 | return IRQ_HANDLED; | 122 | return IRQ_HANDLED; |
| 122 | 123 | ||
| 123 | /* Clear the counter */ | 124 | /* Clear the counter */ |