public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <chris@printf.net>
Cc: linux-mmc <linux-mmc@vger.kernel.org>
Subject: [PATCH 3/6] mmc: It is not an error for the card to be removed while suspended
Date: Tue, 23 Sep 2014 23:00:27 +0300	[thread overview]
Message-ID: <1411502430-25535-4-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1411502430-25535-1-git-send-email-adrian.hunter@intel.com>

A removable card can be removed while it is runtime suspended.
Do not print an error message.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/core/mmc.c | 2 +-
 drivers/mmc/core/sd.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index ce11d89..1d827eb 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1804,7 +1804,7 @@ static int mmc_runtime_resume(struct mmc_host *host)
 		return 0;
 
 	err = _mmc_resume(host);
-	if (err)
+	if (err && (err != -ENOMEDIUM || (host->caps & MMC_CAP_NONREMOVABLE)))
 		pr_err("%s: error %d doing aggessive resume\n",
 			mmc_hostname(host), err);
 
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 2591388..28089b3 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1178,7 +1178,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
 		return 0;
 
 	err = _mmc_sd_resume(host);
-	if (err)
+	if (err && (err != -ENOMEDIUM || (host->caps & MMC_CAP_NONREMOVABLE)))
 		pr_err("%s: error %d doing aggessive resume\n",
 			mmc_hostname(host), err);
 
-- 
1.8.3.2


  parent reply	other threads:[~2014-09-23 20:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-23 20:00 [PATCH 0/6] mmc: Some misc patches Adrian Hunter
2014-09-23 20:00 ` [PATCH 1/6] mmc: Fix use of wrong device in mmc_gpiod_free_cd() Adrian Hunter
2014-09-29  9:44   ` Ulf Hansson
2014-09-23 20:00 ` [PATCH 2/6] mmc: Fix incorrect warning when setting 0 Hz via debugfs Adrian Hunter
2014-09-29  9:44   ` Ulf Hansson
2014-09-23 20:00 ` Adrian Hunter [this message]
2014-09-25  8:27   ` [PATCH 3/6] mmc: It is not an error for the card to be removed while suspended Ulf Hansson
2014-09-25  9:26     ` Adrian Hunter
2014-09-23 20:00 ` [PATCH 4/6] mmc: block: Fix error recovery stop cmd timeout calculation Adrian Hunter
2014-09-25  8:37   ` Ulf Hansson
2014-09-23 20:00 ` [PATCH 5/6] mmc: block: Fix SD card stop cmd response type Adrian Hunter
2014-09-25  9:20   ` Ulf Hansson
2014-09-30 11:21     ` Adrian Hunter
2014-09-30 12:09       ` Ulf Hansson
2014-09-30 12:41         ` Adrian Hunter
2014-10-01  8:36           ` Ulf Hansson
2014-09-23 20:00 ` [PATCH 6/6] mmc: sdhci: Transfer Complete has higher priority than Data Timeout Error Adrian Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411502430-25535-4-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=chris@printf.net \
    --cc=linux-mmc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox