Commit 901aec21 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents de29ade4 58abdd80

drivers/mmc/host/sdhci_f_sdh30.c

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

}