From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754687AbbJ0Izp (ORCPT ); Tue, 27 Oct 2015 04:55:45 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:38395 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752996AbbJ0Izl (ORCPT ); Tue, 27 Oct 2015 04:55:41 -0400 From: =?UTF-8?q?B=C3=A1lint=20Czobor?= Cc: linux-kernel@vger.kernel.org, llinux-mmc@vger.kernel.org, San Mehat , =?UTF-8?q?B=C3=A1lint=20Czobor?= Subject: [PATCH 2/3] mmc: sd: When resuming, try a little harder to init the card Date: Tue, 27 Oct 2015 09:55:32 +0100 Message-Id: <1445936132-5970-1-git-send-email-czoborbalint@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: San Mehat Signed-off-by: San Mehat Signed-off-by: Bálint Czobor --- drivers/mmc/core/sd.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index dcbbd33..359facd 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1115,6 +1115,9 @@ static int mmc_sd_suspend(struct mmc_host *host) static int _mmc_sd_resume(struct mmc_host *host) { int err = 0; +#ifdef CONFIG_MMC_PARANOID_SD_INIT + int retries; +#endif BUG_ON(!host); BUG_ON(!host->card); @@ -1125,7 +1128,23 @@ static int _mmc_sd_resume(struct mmc_host *host) goto out; mmc_power_up(host, host->card->ocr); +#ifdef CONFIG_MMC_PARANOID_SD_INIT + retries = 5; + while (retries) { + err = mmc_sd_init_card(host, host->card->ocr, host->card); + + if (err) { + printk(KERN_ERR "%s: Re-init card rc = %d (retries = %d)\n", + mmc_hostname(host), err, retries); + mdelay(5); + retries--; + continue; + } + break; + } +#else err = mmc_sd_init_card(host, host->card->ocr, host->card); +#endif mmc_card_clr_suspended(host->card); out: -- 1.7.9.5