diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:06 +0000 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:06 +0000 |
commit | 95263782222ba14acb4f45ce40343286653a212d (patch) | |
tree | b1b91815dc7ecc03361e3e3ce192f7d64b71fe2e /drivers/mmc/core/core.c | |
parent | 9c032b533b870102c1929870059ec2c089a31f2b (diff) | |
parent | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.03-android
Diffstat (limited to 'drivers/mmc/core/core.c')
-rw-r--r-- | drivers/mmc/core/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index ea3a72754793..6cd8cae8f4ae 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2831,6 +2831,14 @@ int mmc_pm_notify(struct notifier_block *notify_block, if (!err) break; + if (!mmc_card_is_removable(host)) { + dev_warn(mmc_dev(host), + "pre_suspend failed for non-removable host: " + "%d\n", err); + /* Avoid removing non-removable hosts */ + break; + } + /* Calling bus_ops->remove() with a claimed host can deadlock */ host->bus_ops->remove(host); mmc_claim_host(host); |