From patchwork Tue Sep 23 20:00:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 4959591 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CD72C9F313 for ; Tue, 23 Sep 2014 20:02:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEEE420279 for ; Tue, 23 Sep 2014 20:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2AA82022D for ; Tue, 23 Sep 2014 20:02:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755830AbaIWUCB (ORCPT ); Tue, 23 Sep 2014 16:02:01 -0400 Received: from mga14.intel.com ([192.55.52.115]:41324 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756475AbaIWUB6 (ORCPT ); Tue, 23 Sep 2014 16:01:58 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 23 Sep 2014 12:52:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,582,1406617200"; d="scan'208";a="595790507" Received: from ahunter-desktop.fi.intel.com ([10.237.72.97]) by fmsmga001.fm.intel.com with ESMTP; 23 Sep 2014 13:01:56 -0700 From: Adrian Hunter To: Ulf Hansson , Chris Ball Cc: linux-mmc 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 Message-Id: <1411502430-25535-4-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1411502430-25535-1-git-send-email-adrian.hunter@intel.com> References: <1411502430-25535-1-git-send-email-adrian.hunter@intel.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A removable card can be removed while it is runtime suspended. Do not print an error message. Signed-off-by: Adrian Hunter --- 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);