Skip to content

Commit 340cb39

Browse files
gscuikrzk
authored andcommitted
memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()
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: e81b6ab ("memory: add a driver for atmel ram controllers") Signed-off-by: Gaosheng Cui <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent ef86b2c commit 340cb39

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/memory/atmel-sdramc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,17 @@ static int atmel_ramc_probe(struct platform_device *pdev)
4747
caps = of_device_get_match_data(&pdev->dev);
4848

4949
if (caps->has_ddrck) {
50-
clk = devm_clk_get(&pdev->dev, "ddrck");
50+
clk = devm_clk_get_enabled(&pdev->dev, "ddrck");
5151
if (IS_ERR(clk))
5252
return PTR_ERR(clk);
53-
clk_prepare_enable(clk);
5453
}
5554

5655
if (caps->has_mpddr_clk) {
57-
clk = devm_clk_get(&pdev->dev, "mpddr");
56+
clk = devm_clk_get_enabled(&pdev->dev, "mpddr");
5857
if (IS_ERR(clk)) {
5958
pr_err("AT91 RAMC: couldn't get mpddr clock\n");
6059
return PTR_ERR(clk);
6160
}
62-
clk_prepare_enable(clk);
6361
}
6462

6563
return 0;

0 commit comments

Comments
 (0)