ASoC: codecs: va-macro: fix resource leak in probe error path
Subsystems (4)
PATCH 1/1 ASoC: codecs: va-macro: fix resource leak in probe error path
In the commit referenced by the Fixes tag, clk_hw_get_clk() was added in va_macro_probe() to get the fsgen clock, but forgot to add the corresponding clk_put() in va_macro_remove(). This leads to a clock reference leak when the driver is unloaded.
Add clk_put() call in va_macro_remove() to properly release the clock reference obtained in probe.
--- sound/soc/codecs/lpass-va-macro.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/lpass-va-macro.c +1 -0
@@ -1663,6 +1663,7 @@ static void va_macro_remove(struct platform_device *pdev) {struct va_macro *va =dev_get_drvdata (&pdev->dev); +clk_put (va->fsgen);if (va->has_npl_clk)clk_disable_unprepare (va->npl);
Signature · 1 line
2.50.1.windows.1
Quoted 11 lines · Haotian Zhang
In the commit referenced by the Fixes tag,
clk_hw_get_clk()was added inva_macro_probe()to get the fsgen clock, but forgot to add the correspondingclk_put()inva_macro_remove(). This leads to a clock reference leak when the driver is unloaded.Add
clk_put()call inva_macro_remove()to properly release the clock reference obtained in probe.Fixes 30097967e056 ("ASoC: codecs: va-macro: use fsgen as clock")Signed-off-by Haotian Zhang <[email protected]>---
You can switch the clk_hw_get_clk to devm_clk_hw_get_clk() instead
Konrad
PATCH v2 1/1 ASoC: codecs: va-macro: fix resource leak in probe error path
In reply to Haotian ZhangIn the commit referenced by the Fixes tag, clk_hw_get_clk() was added in va_macro_probe() to get the fsgen clock, but forgot to add the corresponding clk_put() in va_macro_remove(). This leads to a clock reference leak when the driver is unloaded.
Switch to devm_clk_hw_get_clk() to automatically manage the clock resource.
---
Changes in v2:
-Switch to devm_clk_hw_get_clk() instead.
--- sound/soc/codecs/lpass-va-macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/lpass-va-macro.c +1 -1
@@ -1636,7 +1636,7 @@ static int va_macro_probe(struct platform_device *pdev)if (ret) goto err_clkout; - va->fsgen =clk_hw_get_clk (&va->hw,"fsgen" ); + va->fsgen =devm_clk_hw_get_clk (dev, &va->hw,"fsgen" );if (IS_ERR (va->fsgen)) { ret =PTR_ERR (va->fsgen); goto err_clkout;
Signature · 1 line
2.50.1.windows.1
Quoted 10 lines · Haotian Zhang
In the commit referenced by the Fixes tag,
clk_hw_get_clk()was added inva_macro_probe()to get the fsgen clock, but forgot to add the correspondingclk_put()inva_macro_remove(). This leads to a clock reference leak when the driver is unloaded.Switch to
devm_clk_hw_get_clk()to automatically manage the clock resource.Fixes 30097967e056 ("ASoC: codecs: va-macro: use fsgen as clock")Suggested-by Konrad Dybcio <[email protected]>
I feel like that's a little much given you found the original issue and I only suggested a different way to tackle it, but regardless:
Konrad
Mark Brown
maintainerQuoted 4 lines · Haotian Zhang
In the commit referenced by the Fixes tag,
clk_hw_get_clk()was added inva_macro_probe()to get the fsgen clock, but forgot to add the correspondingclk_put()inva_macro_remove(). This leads to a clock reference leak when the driver is unloaded.
Please don't send new patches in reply to old patches or serieses, this makes it harder for both people and tools to understand what is going on - it can bury things in mailboxes and make it difficult to keep track of what current patches are, both for the new patches and the old ones.
Mark Brown
maintainerQuoted 9 lines · Haotian Zhang
In the commit referenced by the Fixes tag,
clk_hw_get_clk()was added inva_macro_probe()to get the fsgen clock, but forgot to add the correspondingclk_put()inva_macro_remove(). This leads to a clock reference leak when the driver is unloaded.Switch to
devm_clk_hw_get_clk()to automatically manage the clock resource.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: codecs: va-macro: fix resource leak in probe error path
commit: 3dc8c73365d3ca25c99e7e1a0f493039d7291df5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark