hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: meson-gx: fix error path when driver initialization fails before enabling clocks 

This patch fixes the case where meson_mmc_probe function fails before
core_clk is enabled.
Originally, that would result in a try to disable the core clock, and if
it was not already enabled, it would result in a kernel warning.
This issue is similar to the one with div_clk.
Fix it by introducing another error path used only between successfully
enabling the core clock, and successfully enabling the div clock.
That would ensure that core clock is disabled only if it was enabled before.

Signed-off-by: Michał Zegan <webczat@webczatnet.pl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Michał Zegan 2017-03-14 21:05:20 +01:00 committed by Ulf Hansson
parent e8ce6742f8
commit ce473d5b49
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/host/meson-gx-mmc.c
View File

@ -743,7 +743,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
ret = meson_mmc_clk_init(host);
if (ret)
goto free_host;
goto err_core_clk;
/* Stop execution */
writel(0, host->regs + SD_EMMC_START);
@ -783,8 +783,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
err_div_clk:
clk_disable_unprepare(host->cfg_div_clk);
free_host:
err_core_clk:
clk_disable_unprepare(host->core_clk);
free_host:
mmc_free_host(mmc);
return ret;
}