projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eda11ab
)
memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
author
Gaosheng Cui
<cuigaosheng1@huawei.com>
Fri, 25 Nov 2022 07:37:57 +0000
(15:37 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 1 Feb 2023 07:27:03 +0000
(08:27 +0100)
[ Upstream commit
340cb392a038cf70540a4cdf2e98a247c66b6df4
]
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>
Link:
https://lore.kernel.org/r/20221125073757.3535219-1-cuigaosheng1@huawei.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/memory/atmel-sdramc.c
patch
|
blob
|
history
diff --git
a/drivers/memory/atmel-sdramc.c
b/drivers/memory/atmel-sdramc.c
index
9c49d00
..
ea6e9e1
100644
(file)
--- 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;