Commit a64b00f0 authored by Yangtao Li's avatar Yangtao Li Committed by sanglipeng
Browse files

mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove 

stable inclusion
from stable-v5.10.192
commit 5962f64ed2b674103f1b0ee64a36bb8f61e5e06c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I933RF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5962f64ed2b674103f1b0ee64a36bb8f61e5e06c



--------------------------------

commit 58abdd80 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: 5def5c1c ("mmc: sdhci-f-sdh30: Replace with sdhci_pltfm")
Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reported-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarAdrian 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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 5653f37b

drivers/mmc/host/sdhci_f_sdh30.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

}