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

Signed-off-by: San Mehat <san@android.com>

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index db828959d6d1fb19d23ee55b7b702b63280a763f..e41400bbe42f0b2a4417cec4d77ff2035c5a6552 100644 (file)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1127,6 +1127,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);
@@ -1137,7 +1140,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: