Commit 3c5db53b authored by Adrian Hunter's avatar Adrian Hunter Committed by Tim Gardner

mmc: It is not an error for the card to be removed while suspended

BugLink: http://bugs.launchpad.net/bugs/1520454

A card can be removed while it is runtime suspended.
Do not print an error message.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
(back ported from commit 520322d9)
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>

 Conflicts:
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
parent 47214bf7
...@@ -1946,8 +1946,8 @@ static int mmc_runtime_resume(struct mmc_host *host) ...@@ -1946,8 +1946,8 @@ static int mmc_runtime_resume(struct mmc_host *host)
return 0; return 0;
err = _mmc_resume(host); err = _mmc_resume(host);
if (err) if (err && err != -ENOMEDIUM)
pr_err("%s: error %d doing aggressive resume\n", pr_err("%s: error %d doing runtime resume\n",
mmc_hostname(host), err); mmc_hostname(host), err);
return 0; return 0;
......
...@@ -1169,8 +1169,8 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) ...@@ -1169,8 +1169,8 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
return 0; return 0;
err = _mmc_sd_resume(host); err = _mmc_sd_resume(host);
if (err) if (err && err != -ENOMEDIUM)
pr_err("%s: error %d doing aggressive resume\n", pr_err("%s: error %d doing runtime resume\n",
mmc_hostname(host), err); mmc_hostname(host), err);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment