diff options
| author | San Mehat <san@android.com> | 2011-11-20 09:53:27 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-11-20 10:17:58 +0800 |
| commit | 10f536cb8274b61c25bbecb4ee57198b18756bc1 (patch) | |
| tree | 36516d4dc3cfd581e390ae7a7347e59137165ade /drivers | |
| parent | a23165d820648f19fc70cc521d400e3169c4dbf6 (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')
| -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 d55203f2c85..ccf1521a7e1 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1094,12 +1094,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; |