summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2018-03-09 15:10:21 +0900
committerUlf Hansson <ulf.hansson@linaro.org>2018-03-15 10:34:30 +0100
commite22842dd64bf86753d3f2b6ea474d73fc1e6ca24 (patch)
treed5c3aedb9d35a03ea70ad9ad2cb83af87da02eb7 /drivers
parente74ef2194b41ba5e511fab29fe5ff00e72d2f42a (diff)
downloadtalos-obmc-linux-e22842dd64bf86753d3f2b6ea474d73fc1e6ca24.tar.gz
talos-obmc-linux-e22842dd64bf86753d3f2b6ea474d73fc1e6ca24.zip
mmc: dw_mmc: exynos: fix the suspend/resume issue for exynos5433
Before enabling the clock, dwmmc exynos driver is trying to access the register. Then the kernel panic can be occurred. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Tested-by: Chanwoo Choi <cw00.choi@samsung.com> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/dw_mmc-exynos.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index fa41d9422d57..a84aa3f1ae85 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -165,9 +165,15 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)
static int dw_mci_exynos_runtime_resume(struct device *dev)
{
struct dw_mci *host = dev_get_drvdata(dev);
+ int ret;
+
+ ret = dw_mci_runtime_resume(dev);
+ if (ret)
+ return ret;
dw_mci_exynos_config_smu(host);
- return dw_mci_runtime_resume(dev);
+
+ return ret;
}
/**
OpenPOWER on IntegriCloud