mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
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>
This commit is contained in:
commit
901aec215d
1 changed files with 7 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue