* [PATCH] memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
@ 2022-11-25 7:37 Gaosheng Cui
2022-12-27 8:59 ` Krzysztof Kozlowski
0 siblings, 1 reply; 2+ messages in thread
From: Gaosheng Cui @ 2022-11-25 7:37 UTC (permalink / raw)
To: krzysztof.kozlowski, nicolas.ferre, alexandre.belloni,
claudiu.beznea, mripard, cuigaosheng1
Cc: linux-arm-kernel
The clk_disable_unprepare() should be called in the error handling
of caps->has_mpddr_clk, fix it by replacing devm_clk_get and
clk_prepare_enable by devm_clk_get_enabled.
Fixes: e81b6abebc87 ("memory: add a driver for atmel ram controllers")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
---
drivers/memory/atmel-sdramc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c
index 9c49d00c2a96..ea6e9e1eaf04 100644
--- a/drivers/memory/atmel-sdramc.c
+++ b/drivers/memory/atmel-sdramc.c
@@ -47,19 +47,17 @@ static int atmel_ramc_probe(struct platform_device *pdev)
caps = of_device_get_match_data(&pdev->dev);
if (caps->has_ddrck) {
- clk = devm_clk_get(&pdev->dev, "ddrck");
+ clk = devm_clk_get_enabled(&pdev->dev, "ddrck");
if (IS_ERR(clk))
return PTR_ERR(clk);
- clk_prepare_enable(clk);
}
if (caps->has_mpddr_clk) {
- clk = devm_clk_get(&pdev->dev, "mpddr");
+ clk = devm_clk_get_enabled(&pdev->dev, "mpddr");
if (IS_ERR(clk)) {
pr_err("AT91 RAMC: couldn't get mpddr clock\n");
return PTR_ERR(clk);
}
- clk_prepare_enable(clk);
}
return 0;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
2022-11-25 7:37 [PATCH] memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe() Gaosheng Cui
@ 2022-12-27 8:59 ` Krzysztof Kozlowski
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Kozlowski @ 2022-12-27 8:59 UTC (permalink / raw)
To: nicolas.ferre, claudiu.beznea, mripard, alexandre.belloni, Gaosheng Cui
Cc: Krzysztof Kozlowski, linux-arm-kernel
On Fri, 25 Nov 2022 15:37:57 +0800, Gaosheng Cui wrote:
> The clk_disable_unprepare() should be called in the error handling
> of caps->has_mpddr_clk, fix it by replacing devm_clk_get and
> clk_prepare_enable by devm_clk_get_enabled.
>
>
Applied, thanks!
[1/1] memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
https://git.kernel.org/krzk/linux-mem-ctrl/c/340cb392a038cf70540a4cdf2e98a247c66b6df4
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-27 9:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-25 7:37 [PATCH] memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe() Gaosheng Cui
2022-12-27 8:59 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).