[SRU][J:linux-bluefield][PATCH v5 6/7] mmc: sdhci-of-dwcmshc: Add error handling in dwcmshc_resume
Liming Sun
limings at nvidia.com
Wed Jan 3 19:27:54 UTC 2024
BugLink: https://bugs.launchpad.net/bugs/2046657
This commit adds handling in dwcmshc_resume() for different error
cases.
Signed-off-by: Liming Sun <limings at nvidia.com>
Acked-by: Adrian Hunter <adrian.hunter at intel.com>
Link: https://lore.kernel.org/r/20230822195929.168552-1-limings@nvidia.com
Signed-off-by: Ulf Hansson <ulf.hansson at linaro.org>
(cherry picked from commit a11937b3cff5449871f428e46e202481dc61a9de)
Signed-off-by: Liming Sun <limings at nvidia.com>
---
drivers/mmc/host/sdhci-of-dwcmshc.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c
index 1e78c1e33325..bb0fe18be5dc 100644
--- a/drivers/mmc/host/sdhci-of-dwcmshc.c
+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
@@ -536,17 +536,32 @@ static int dwcmshc_resume(struct device *dev)
if (!IS_ERR(priv->bus_clk)) {
ret = clk_prepare_enable(priv->bus_clk);
if (ret)
- return ret;
+ goto disable_clk;
}
if (rk_priv) {
ret = clk_bulk_prepare_enable(RK35xx_MAX_CLKS,
rk_priv->rockchip_clks);
if (ret)
- return ret;
+ goto disable_bus_clk;
}
- return sdhci_resume_host(host);
+ ret = sdhci_resume_host(host);
+ if (ret)
+ goto disable_rockchip_clks;
+
+ return 0;
+
+disable_rockchip_clks:
+ if (rk_priv)
+ clk_bulk_disable_unprepare(RK35xx_MAX_CLKS,
+ rk_priv->rockchip_clks);
+disable_bus_clk:
+ if (!IS_ERR(priv->bus_clk))
+ clk_disable_unprepare(priv->bus_clk);
+disable_clk:
+ clk_disable_unprepare(pltfm_host->clk);
+ return ret;
}
#endif
--
2.30.1
More information about the kernel-team
mailing list