diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 11:13:20 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 11:13:20 +0100 |
| commit | 17314a20806fef268355de268d639b9515e8fd76 (patch) | |
| tree | 6c7cd3ae0d997381e15dd551fdc62bc1ee19cc42 /drivers/clocksource | |
| parent | e0f2806138a4eeb3c31abe0e0e767d0f6d9a13a3 (diff) | |
| parent | 96c00ece76be83d99dc7f66fd15e5641524791cf (diff) | |
Merge tag 'v4.4.107' into toradex_vf_4.4-next
This is the 4.4.107 stable release
Diffstat (limited to 'drivers/clocksource')
| -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 9a7e37cf56b0..e1d7373e63e0 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) /* Turn off the clock (and clear the event) */ 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; /* Clear the counter */ |