--- drivers/mmc/core/sd.c

+++ drivers/mmc/core/sd.c

@@ -556,7 +556,6 @@ static void mmc_sd_remove(struct mmc_hos

mmc_remove_card(host->card);

host->card = NULL;

}

-

#if 0

/*

* When "deferred resume" fails, run another thread to stop mmcqd.

@@ -588,7 +587,6 @@ static void mmc_sd_err_with_deferred_res

}

}

#endif

-

/*

* Card detection callback from host.

*/

@@ -693,6 +691,14 @@ static int mmc_sd_resume(struct mmc_host

#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

if (err)

mmc_sd_err_with_deferred_resume(host);

+#else

+ if (err) {

+ mmc_sd_remove(host);

+

+ mmc_claim_host(host);

+ mmc_detach_bus(host);

+ mmc_release_host(host);

+ }

#endif

#endif