Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d1bf525 authored by San Mehat's avatar San Mehat Committed by Dmitry Shmidt
Browse files

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



Signed-off-by: default avatarSan Mehat <san@android.com>
parent 6bb7b604

drivers/mmc/core/sd.c

+19 −0
Original line number Diff line number Diff line
@@ -1157,6 +1157,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);
@@ -1167,7 +1170,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: