]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
clocksource/drivers/cadence-ttc: Add missing clk_disable_unprepare in ttc_setup_clock...
authorGaosheng Cui <cuigaosheng1@huawei.com>
Sat, 3 Aug 2024 06:42:53 +0000 (14:42 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 6 Sep 2024 12:49:21 +0000 (14:49 +0200)
Add the missing clk_disable_unprepare() before return in
ttc_setup_clockevent().

Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Reviewed-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20240803064253.331946-3-cuigaosheng1@huawei.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/timer-cadence-ttc.c

index ca7a06489c405f1d013e0fedd997413c43a19d65..b8a1cf59b9d6154892cf33f677f6782c079594e5 100644 (file)
@@ -435,7 +435,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,
                                    &ttcce->ttc.clk_rate_change_nb);
        if (err) {
                pr_warn("Unable to register clock notifier.\n");
-               goto out_kfree;
+               goto out_clk_unprepare;
        }
 
        ttcce->ttc.freq = clk_get_rate(ttcce->ttc.clk);
@@ -465,13 +465,15 @@ static int __init ttc_setup_clockevent(struct clk *clk,
        err = request_irq(irq, ttc_clock_event_interrupt,
                          IRQF_TIMER, ttcce->ce.name, ttcce);
        if (err)
-               goto out_kfree;
+               goto out_clk_unprepare;
 
        clockevents_config_and_register(&ttcce->ce,
                        ttcce->ttc.freq / PRESCALE, 1, 0xfffe);
 
        return 0;
 
+out_clk_unprepare:
+       clk_disable_unprepare(ttcce->ttc.clk);
 out_kfree:
        kfree(ttcce);
        return err;