diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-08-15 13:28:18 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-08-15 13:28:18 +0200 |
| commit | 901aec215d6e443ae23952db0265381c504dae83 (patch) | |
| tree | a55bc18b337befcbca89aee14ee27ec6cdba77a3 /drivers/mmc | |
| parent | mmc: sdhci_am654: Convert to platform remove callback returning void (diff) | |
| parent | mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove (diff) | |
| download | linux-901aec215d6e443ae23952db0265381c504dae83.tar.xz linux-901aec215d6e443ae23952db0265381c504dae83.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.5-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.6.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci_f_sdh30.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c index b01ffb4d0973..3215063bcf86 100644 --- 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; } |