mmc: sd: Add retries in re-detection
PATCH 3/3 mmc: sd: Add retries in re-detection
From: San Mehat <[email protected]>
Signed-off-by San Mehat <[email protected]>
mmc: sd: Remove debugging printk
Signed-off-by Dima Zavin <[email protected]>
Signed-off-by Bálint Czobor <[email protected]>
--- drivers/mmc/core/sd.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
drivers/mmc/core/sd.c +41 -1
@@ -1043,7 +1043,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);
@@ -1053,7 +1056,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);
@@ -1230,6 +1249,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);
@@ -1266,9 +1288,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);
Signature · 1 line
1.7.9.5