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

Commit 0a3f5620 authored by San Mehat's avatar San Mehat Committed by Dmitry Shmidt
Browse files

ANDROID: mmc: sd: Add retries in re-detection 



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

mmc: sd: Remove debugging printk

Signed-off-by: default avatarDima Zavin <dima@android.com>
parent 3d1bf525

drivers/mmc/core/sd.c

+41 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,10 @@ static int mmc_sd_alive(struct mmc_host *host) 
 */

static void mmc_sd_detect(struct mmc_host *host)

{

	int err;

	int err = 0;

#ifdef CONFIG_MMC_PARANOID_SD_INIT

	int retries = 5;

#endif



	BUG_ON(!host);

	BUG_ON(!host->card);
@@ -1095,7 +1098,23 @@ static void mmc_sd_detect(struct mmc_host *host) 
	/*

	 * Just check if our card has been removed.

	 */

#ifdef CONFIG_MMC_PARANOID_SD_INIT

	while(retries) {

		err = mmc_send_status(host->card, NULL);

		if (err) {

			retries--;

			udelay(5);

			continue;

		}

		break;

	}

	if (!retries) {

		printk(KERN_ERR "%s(%s): Unable to re-detect card (%d)\n",

		       __func__, mmc_hostname(host), err);

	}

#else

	err = _mmc_detect_card_removed(host);

#endif



	mmc_put_card(host->card);
@@ -1261,6 +1280,9 @@ int mmc_attach_sd(struct mmc_host *host) 
{

	int err;

	u32 ocr, rocr;

#ifdef CONFIG_MMC_PARANOID_SD_INIT

	int retries;

#endif



	BUG_ON(!host);

	WARN_ON(!host->claimed);
@@ -1297,9 +1319,27 @@ int mmc_attach_sd(struct mmc_host *host) 
	/*

	 * Detect and init the card.

	 */

#ifdef CONFIG_MMC_PARANOID_SD_INIT

	retries = 5;

	while (retries) {

		err = mmc_sd_init_card(host, rocr, NULL);

		if (err) {

			retries--;

			continue;

		}

		break;

	}



	if (!retries) {

		printk(KERN_ERR "%s: mmc_sd_init_card() failure (err = %d)\n",

		       mmc_hostname(host), err);

		goto err;

	}

#else

	err = mmc_sd_init_card(host, rocr, NULL);

	if (err)

		goto err;

#endif



	mmc_release_host(host);

	err = mmc_add_card(host->card);