summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2025-10-17 07:50:39 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2025-11-26 11:24:37 +0100
commit6b38a8b31e2c5c2c3fd5f9848850788c190f216d (patch)
tree996e6c54ce0b1e4d84d751686f317fa417226719 /drivers/clocksource
parent2ba8e2aae1324704565a7d4d66f199d056c9e3c6 (diff)
clocksource/drivers/stm: Fix double deregistration on probe failure
The purpose of the devm_add_action_or_reset() helper is to call the action function in case adding an action ever fails so drop the clock source deregistration from the error path to avoid deregistering twice. Fixes: cec32ac75827 ("clocksource/drivers/nxp-timer: Add the System Timer Module for the s32gx platforms") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://patch.msgid.link/20251017055039.7307-1-johan@kernel.org
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/timer-nxp-stm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clocksource/timer-nxp-stm.c b/drivers/clocksource/timer-nxp-stm.c
index bbc40623728f..16d52167e949 100644
--- a/drivers/clocksource/timer-nxp-stm.c
+++ b/drivers/clocksource/timer-nxp-stm.c
@@ -208,10 +208,8 @@ static int __init nxp_stm_clocksource_init(struct device *dev, struct stm_timer
return ret;
ret = devm_add_action_or_reset(dev, devm_clocksource_unregister, stm_timer);
- if (ret) {
- clocksource_unregister(&stm_timer->cs);
+ if (ret)
return ret;
- }
stm_sched_clock = stm_timer;