@@ -324,11 +324,12 @@ static int meson_mmc_clk_init(struct meson_host *host)
writel(cfg, host->regs + SD_EMMC_CFG);
ret = clk_prepare_enable(host->cfg_div_clk);
- if (!ret)
+ if (!ret) {
ret = meson_mmc_clk_set(host, f_min);
- if (!ret)
- clk_disable_unprepare(host->cfg_div_clk);
+ if (ret)
+ clk_disable_unprepare(host->cfg_div_clk);
+ }
return ret;
}
--
2.11.0
From 66bcfa5eb8375f8b7fcd06fd0a83791c0d61f38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zegan?= <webczat@webczatnet.pl>
Date: Thu, 16 Feb 2017 15:08:56 +0100
Subject: [PATCH 2/2] mmc: meson-gx: remove mmc host on device removal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The mmc host was added in meson_mmc_probe, but never removed in meson_mmc_remove.
Fix that by removing the host before deallocating other resources.
Signed-off-by: Michał Zegan <webczat@webczatnet.pl>
---
drivers/mmc/host/meson-gx-mmc.c | 2 ++
1 file changed, 2 insertions(+)
@@ -818,6 +818,8 @@ static int meson_mmc_remove(struct platform_device *pdev)
if (WARN_ON(!host))
return 0;
+ mmc_remove_host(host->mmc);
+
if (host->bounce_buf)
dma_free_coherent(host->dev, host->bounce_buf_size,
host->bounce_buf, host->bounce_dma_addr);