evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: San Mehat <san@android.com>
This commit is contained in:
San Mehat 2008-12-01 08:52:34 -08:00 • committed by John Stultz
parent 94d5306d03
commit f1da17ac8a
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/mmc/core/sd.c
View file

@ -1127,6 +1127,9 @@ static int mmc_sd_suspend(struct mmc_host *host)
static int _mmc_sd_resume(struct mmc_host *host) static int _mmc_sd_resume(struct mmc_host *host)
{ {
int err = 0; int err = 0;
#ifdef CONFIG_MMC_PARANOID_SD_INIT
int retries;
#endif
BUG_ON(!host); BUG_ON(!host);
BUG_ON(!host->card); BUG_ON(!host->card);
@ -1137,7 +1140,23 @@ static int _mmc_sd_resume(struct mmc_host *host)
goto out; goto out;
mmc_power_up(host, host->card->ocr); 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); 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); mmc_card_clr_suspended(host->card);
out: out: