diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-02-23 14:58:32 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-28 17:50:46 +0100 |
| commit | e155fc5cb59f2fc26d21c3b3b495d10dc0037ff3 (patch) | |
| tree | 5eccb9094f6943af07b88d4eef3075be902d1446 /target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch | |
| parent | 5af55933e063c01f64bba78f352e95b978a47cc1 (diff) | |
| download | upstream-e155fc5cb59f2fc26d21c3b3b495d10dc0037ff3.tar.gz upstream-e155fc5cb59f2fc26d21c3b3b495d10dc0037ff3.tar.bz2 upstream-e155fc5cb59f2fc26d21c3b3b495d10dc0037ff3.zip | |
x86: Refresh patches on kernel 5.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch')
| -rw-r--r-- | target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch b/target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch index c3a7fce9ce..d4de2027ba 100644 --- a/target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch +++ b/target/linux/x86/patches-5.4/100-fix_cs5535_clockevt.patch @@ -1,12 +1,13 @@ ---- a/drivers/clocksource/cs5535-clockevt.c -+++ b/drivers/clocksource/cs5535-clockevt.c -@@ -130,7 +130,8 @@ static irqreturn_t mfgpt_tick(int irq, v +--- a/drivers/clocksource/timer-cs5535.c ++++ b/drivers/clocksource/timer-cs5535.c +@@ -127,7 +127,9 @@ static irqreturn_t mfgpt_tick(int irq, v cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP, MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2); - cs5535_clockevent.event_handler(&cs5535_clockevent); + if (cs5535_clockevent.event_handler) + cs5535_clockevent.event_handler(&cs5535_clockevent); ++ return IRQ_HANDLED; } |