summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2018-03-15 14:43:28 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2018-03-15 14:43:28 +0100
commita677b67b6994e491f564f9ef773c49a1cd0d9720 (patch)
tree763c5d2a8d194922188d056802fa74c373a6ebe1 /drivers/mmc
parent8ef0797a898b166016d486d6f30ce6044f800ddb (diff)
parentc658dc58c7eaa8569ceb0edd1ddbdfda84fe8aa5 (diff)
downloadlinux-a677b67b6994e491f564f9ef773c49a1cd0d9720.tar.bz2
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
-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;
}
/**