projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf3f15b
)
mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove
author
Yangtao Li
<frank.li@vivo.com>
Thu, 27 Jul 2023 07:00:51 +0000
(15:00 +0800)
committer
Ulf Hansson
<ulf.hansson@linaro.org>
Tue, 15 Aug 2023 11:24:29 +0000
(13:24 +0200)
The order of function calls in sdhci_f_sdh30_remove is wrong,
let's call sdhci_pltfm_unregister first.
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fixes:
5def5c1c15bf
("mmc: sdhci-f-sdh30: Replace with sdhci_pltfm")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link:
https://lore.kernel.org/r/20230727070051.17778-62-frank.li@vivo.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci_f_sdh30.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/host/sdhci_f_sdh30.c
b/drivers/mmc/host/sdhci_f_sdh30.c
index
b01ffb4
..
3215063
100644
(file)
--- a/
drivers/mmc/host/sdhci_f_sdh30.c
+++ b/
drivers/mmc/host/sdhci_f_sdh30.c
@@
-210,13
+210,16
@@
static int sdhci_f_sdh30_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct f_sdhost_priv *priv = sdhci_f_sdhost_priv(host);
-
- reset_control_assert(priv->rst);
- clk_disable_unprepare(priv->clk);
- clk_disable_unprepare(priv->clk_iface);
+ struct clk *clk_iface = priv->clk_iface;
+ struct reset_control *rst = priv->rst;
+ struct clk *clk = priv->clk;
sdhci_pltfm_unregister(pdev);
+ reset_control_assert(rst);
+ clk_disable_unprepare(clk);
+ clk_disable_unprepare(clk_iface);
+
return 0;
}