[PATCH 2/3] cpufreq: kirkwood: Put clocks on error and in remove

From: Suyuan Wang via B4 Relay

Date: Sun Nov 22 2026 - 06:55:38 EST


From: Suyuan Wang <stevewong@xxxxxxxxxxx>

kirkwood_cpufreq_probe() gets three clocks with of_clk_get_by_name():
cpu_clk, ddrclk and powersave. None of them is ever released with
clk_put(). The error paths only disable and unprepare the clocks, and
kirkwood_cpufreq_remove() does the same. So the clock references leak
when probe fails (for example on -EPROBE_DEFER) and on every unbind.

Add the missing clk_put() calls to the error paths and to remove. The
"Unable to prepare" paths now jump to new labels that only put the clock
that failed to enable.

Found with a static analysis tool and checked by hand.

Fixes: 2a4bd9f0db24 ("cpufreq: kirkwood: Add a cpufreq driver for Marvell Kirkwood SoCs")
Co-developed-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Kaixuan Li <kaixuan.li@xxxxxxxxxx>
Signed-off-by: Suyuan Wang <stevewong@xxxxxxxxxxx>
---
drivers/cpufreq/kirkwood-cpufreq.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index 24b285cbeb8d..e85658081c07 100644
--- a/drivers/cpufreq/kirkwood-cpufreq.c
+++ b/drivers/cpufreq/kirkwood-cpufreq.c
@@ -125,7 +125,7 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
err = clk_prepare_enable(priv.cpu_clk);
if (err) {
dev_err(priv.dev, "Unable to prepare cpuclk\n");
- goto out_node;
+ goto out_put_cpu;
}

kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
@@ -140,7 +140,7 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
err = clk_prepare_enable(priv.ddr_clk);
if (err) {
dev_err(priv.dev, "Unable to prepare ddrclk\n");
- goto out_cpu;
+ goto out_put_ddr;
}
kirkwood_freq_table[1].frequency = clk_get_rate(priv.ddr_clk) / 1000;

@@ -153,7 +153,7 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)
err = clk_prepare_enable(priv.powersave_clk);
if (err) {
dev_err(priv.dev, "Unable to prepare powersave clk\n");
- goto out_ddr;
+ goto out_put_powersave;
}

err = cpufreq_register_driver(&kirkwood_cpufreq_driver);
@@ -167,10 +167,16 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev)

out_powersave:
clk_disable_unprepare(priv.powersave_clk);
+out_put_powersave:
+ clk_put(priv.powersave_clk);
out_ddr:
clk_disable_unprepare(priv.ddr_clk);
+out_put_ddr:
+ clk_put(priv.ddr_clk);
out_cpu:
clk_disable_unprepare(priv.cpu_clk);
+out_put_cpu:
+ clk_put(priv.cpu_clk);
out_node:
of_node_put(np);

@@ -182,8 +188,11 @@ static void kirkwood_cpufreq_remove(struct platform_device *pdev)
cpufreq_unregister_driver(&kirkwood_cpufreq_driver);

clk_disable_unprepare(priv.powersave_clk);
+ clk_put(priv.powersave_clk);
clk_disable_unprepare(priv.ddr_clk);
+ clk_put(priv.ddr_clk);
clk_disable_unprepare(priv.cpu_clk);
+ clk_put(priv.cpu_clk);
}

static struct platform_driver kirkwood_cpufreq_platform_driver = {

--
2.34.1