2 files changed, 17 insertions, 1 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 9ffeeb2cba45..0242c6a21daf 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1550,6 +1550,12 @@ static void mmc_setup(struct mmc_host *host)
  */
 void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
+#ifdef CONFIG_MMC_DEBUG
+        mmc_claim_host(host);
+        BUG_ON(host->removed);
+        mmc_release_host(host);
+#endif
+
         mmc_schedule_delayed_work(&host->detect, delay);
 }
 
@@ -1690,6 +1696,14 @@ void mmc_remove_host(struct mmc_host *host)
 {
         struct list_head *l, *n;
 
+#ifdef CONFIG_MMC_DEBUG
+        mmc_claim_host(host);
+        host->removed = 1;
+        mmc_release_host(host);
+#endif
+
+        mmc_flush_scheduled_work();
+
         list_for_each_safe(l, n, &host->cards) {
                 struct mmc_card *card = mmc_list_to_card(l);
 
@@ -1710,7 +1724,6 @@ EXPORT_SYMBOL(mmc_remove_host);
  */
 void mmc_free_host(struct mmc_host *host)
 {
-        mmc_flush_scheduled_work();
         mmc_free_host_sysfs(host);
 }
 
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index c89f41091304..92efe8e5be7e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -147,6 +147,9 @@ struct mmc_host {
         struct mmc_card         *card_selected; /* the selected MMC card */
 
         struct delayed_work     detect;
+#ifdef CONFIG_MMC_DEBUG
+        unsigned int            removed:1;      /* host is being removed */
+#endif
 
         unsigned long           private[0] ____cacheline_aligned;
 };