7ef75445c5
So the upcoming changes needed for 5.15 can be reviewed easily.
Removing following patches backported from 5.15:
* 101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch
* 102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch
Removed upstreamed patch `300-pcengines_apu1_led.patch` in commit
1b40faf7e4ab ("leds: apu: extend support for PC Engines APU1 with newer
firmware")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
14 lines
427 B
Diff
14 lines
427 B
Diff
--- 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;
|
|
}
|
|
|