diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:31:53 +0000 |
| commit | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (patch) | |
| tree | 9587bb407acebb17bbd8a33d2d9c53ecbe1ab442 /drivers/mmc/core/core.c | |
| parent | 78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff) | |
| parent | b766b14a48de577e5060e4d8762f1e4a34229d2b (diff) | |
Merge tag 'v4.4.124' into linux-linaro-lsk-v4.4lsk-v4.4-18.03
This is the 4.4.124 stable release
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 5f7d10ba498a..299a83f1ad38 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2791,6 +2791,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); |