summaryrefslogtreecommitdiff
path: root/drivers/mmc/core/bus.c
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@linaro.org>2017-12-05 17:08:45 +0530
committerSumit Semwal <sumit.semwal@linaro.org>2017-12-05 17:08:45 +0530
commite3b7ec1a7cb893a79fffb9df2c1b8cbd954e789b (patch)
treee3512db045e2228dc88509e338805ad26565ce9b /drivers/mmc/core/bus.c
parentfdc7d50b7fe04f676fd4b1b0f58980544faa1469 (diff)
parentbd379939182247ace70e425ab60b3b1352db601b (diff)
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.104-hikey
Diffstat (limited to 'drivers/mmc/core/bus.c')
-rw-r--r--drivers/mmc/core/bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 972ff844cf5a..cf7c7bc1e940 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -155,6 +155,9 @@ static int mmc_bus_suspend(struct device *dev)
return ret;
ret = host->bus_ops->suspend(host);
+ if (ret)
+ pm_generic_resume(dev);
+
return ret;
}