diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-08 14:03:39 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-08 14:03:39 +0800 |
| commit | 9889b7205a775b94696b39d27325be842d500390 (patch) | |
| tree | b99f2da685b7139acb58ada2d0508d36ca26ce10 /drivers/mmc | |
| parent | 0f646885c342e74051e3d40acd40af310469526d (diff) | |
| parent | f2363994a726dff665d850042ace77e100a80d4a (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/bus.c | 3 |
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; } |