clk: devres: fix cleanup in devm_clk_get_optional_enabled_with_rate()
PATCH 1/1 clk: devres: fix cleanup in devm_clk_get_optional_enabled_with_rate()
devm_clk_get_optional_enabled_with_rate() registers its cleanup action before setting the clock rate. If setting the rate fails, it attempts to disable and unprepare a clock that was never enabled. This issue was spotted while reviewing "rust: clk: add devres-managed clks" [1].
Register the cleanup action only after successfully preparing and enabling the clock.
[1]: https://lore.kernel.org/rust-for-linux/[email protected]
--- drivers/clk/clk-devres.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clk/clk-devres.c +10 -2
@@ -99,6 +99,11 @@ struct clk *devm_clk_get_optional_enabled(struct device *dev, const char *id) }EXPORT_SYMBOL_GPL (devm_clk_get_optional_enabled); +static void devm_clk_disable_unprepare (void *data) +{ +clk_disable_unprepare (data); +} +struct clk *devm_clk_get_optional_enabled_with_rate (struct device *dev,const char *id,unsigned long rate)
@@ -106,8 +111,7 @@ struct clk *devm_clk_get_optional_enabled_with_rate(struct device *dev,struct clk *clk;int ret; - clk =__devm_clk_get (dev, id, clk_get_optional,NULL , - clk_disable_unprepare); + clk =devm_clk_get_optional (dev, id);if (IS_ERR (clk))return ERR_CAST (clk);
@@ -119,6 +123,10 @@ struct clk *devm_clk_get_optional_enabled_with_rate(struct device *dev,if (ret) goto out_put_clk; + ret =devm_add_action_or_reset (dev, devm_clk_disable_unprepare, clk); +if (ret) + goto out_put_clk; +return clk; out_put_clk:
Signature · 1 line
2.51.2
Quoted 5 lines · Onur Özkan
devm_clk_get_optional_enabled_with_rate()registers its cleanup action before setting the clock rate. If setting the rate fails, it attempts to disable and unprepare a clock that was never enabled. This issue was spotted while reviewing "rust: clk: add devres-managed clks" [1].
Quoted 7 lines
Register the cleanup action only after successfully preparing and enabling the clock.
[1]: https://lore.kernel.org/rust-for-linux/[email protected]
Fixes 9934a1bd45b2 ("clk: provide devm_clk_get_optional_enabled_with_rate()")Signed-off-by Onur Özkan <[email protected]>
Quoting Onur Özkan (2026-08-01 04:16:34)
Quoted 5 lines
devm_clk_get_optional_enabled_with_rate()registers its cleanup action before setting the clock rate. If setting the rate fails, it attempts to disable and unprepare a clock that was never enabled. This issue was spotted while reviewing "rust: clk: add devres-managed clks" [1].
Quoted 8 lines
Register the cleanup action only after successfully preparing and enabling the clock.
[1]: https://lore.kernel.org/rust-for-linux/[email protected]
Fixes 9934a1bd45b2 ("clk: provide devm_clk_get_optional_enabled_with_rate()")Signed-off-by Onur Özkan <[email protected]>---
Applied to clk-next