projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4307b4
)
mmc: mtk-sd: Fix missing clk_disable_unprepare in msdc_of_clock_parse()
author
Gaosheng Cui
<cuigaosheng1@huawei.com>
Fri, 25 Nov 2022 09:01:41 +0000
(17:01 +0800)
committer
Ulf Hansson
<ulf.hansson@linaro.org>
Tue, 29 Nov 2022 12:26:06 +0000
(13:26 +0100)
The clk_disable_unprepare() should be called in the error handling
of devm_clk_bulk_get_optional, fix it by replacing devm_clk_get_optional
and clk_prepare_enable by devm_clk_get_optional_enabled.
Fixes:
f5eccd94b63f
("mmc: mediatek: Add subsys clock control for MT8192 msdc")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: stable@vger.kernel.org
Link:
https://lore.kernel.org/r/20221125090141.3626747-1-cuigaosheng1@huawei.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mtk-sd.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/mmc/host/mtk-sd.c
b/drivers/mmc/host/mtk-sd.c
index df941438aef57610062521bb6ba9c0eb2ed354d7..26bc59b5a7ccfde5b490d65f996bef78b1454ca5 100644
(file)
--- a/
drivers/mmc/host/mtk-sd.c
+++ b/
drivers/mmc/host/mtk-sd.c
@@
-2588,13
+2588,11
@@
static int msdc_of_clock_parse(struct platform_device *pdev,
return PTR_ERR(host->src_clk_cg);
}
- host->sys_clk_cg = devm_clk_get_optional(&pdev->dev, "sys_cg");
+ /* If present, always enable for this clock gate */
+ host->sys_clk_cg = devm_clk_get_optional_enabled(&pdev->dev, "sys_cg");
if (IS_ERR(host->sys_clk_cg))
host->sys_clk_cg = NULL;
- /* If present, always enable for this clock gate */
- clk_prepare_enable(host->sys_clk_cg);
-
host->bulk_clks[0].id = "pclk_cg";
host->bulk_clks[1].id = "axi_cg";
host->bulk_clks[2].id = "ahb_cg";