diff options
| author | San Mehat <san@android.com> | 2008-12-01 08:52:34 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:37:58 -0800 |
| commit | 147dd834f18d6dea82f044ce5cd252696531ba96 (patch) | |
| tree | 7122049f5bdcbf4096212d6ba697ec777979c92d /drivers/mmc/core/sd.c | |
| parent | a4e363be5f0d1d328e21ffa1ac6726db3996cf19 (diff) | |
mmc: sd: When resuming, try a little harder to init the card
Signed-off-by: San Mehat <san@android.com>
Diffstat (limited to 'drivers/mmc/core/sd.c')
| -rw-r--r-- | drivers/mmc/core/sd.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index e8dce3a74c5d..3c0e8ead4c7e 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1096,12 +1096,31 @@ static int mmc_sd_suspend(struct mmc_host *host) static int mmc_sd_resume(struct mmc_host *host) { int err; +#ifdef CONFIG_MMC_PARANOID_SD_INIT + int retries; +#endif BUG_ON(!host); BUG_ON(!host->card); mmc_claim_host(host); +#ifdef CONFIG_MMC_PARANOID_SD_INIT + retries = 5; + while (retries) { + err = mmc_sd_init_card(host, host->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->ocr, host->card); +#endif mmc_release_host(host); return err; |