]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove
authorYangtao Li <frank.li@vivo.com>
Thu, 27 Jul 2023 07:00:51 +0000 (15:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Aug 2023 12:23:38 +0000 (14:23 +0200)
commit 58abdd80b93b09023ca03007b608685c41e3a289 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/sdhci_f_sdh30.c

index 8876fd1c7eee0382c5ce0c4e5df90c74ec9d0533..7ede74bf37230c58f6a16e04c713f1b194d5c384 100644 (file)
@@ -188,12 +188,14 @@ 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);
-
-       clk_disable_unprepare(priv->clk_iface);
-       clk_disable_unprepare(priv->clk);
+       struct clk *clk_iface = priv->clk_iface;
+       struct clk *clk = priv->clk;
 
        sdhci_pltfm_unregister(pdev);
 
+       clk_disable_unprepare(clk_iface);
+       clk_disable_unprepare(clk);
+
        return 0;
 }