Skip to contentSkip to conversation

mmc: sd: When resuming, try a little harder to init the card

PATCH In review Bálint Czobor 1 participant 1 message Oct 27, 2015 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 mmc: sd: When resuming, try a little harder to init the card

From: San Mehat <[email protected]>

---
 drivers/mmc/core/sd.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
drivers/mmc/core/sd.c +19 -0
index dcbbd33..359facd 100644
@@ -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:
Signature · 1 line
1.7.9.5