---

yaml --- r: 53575 b: refs/heads/master c: 3b91e55 h: refs/heads/master i: 53573: 8cf181c 53571: 11c27e7 53567: 3011685 v: v3
git-mirror · May 1, 2007 · f519e25 · f519e25
1 parent 360c989
commit f519e25
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c6a0718f0bfdab0d9b7da5f7b74f38a0058c03a
+refs/heads/master: 3b91e5507cddaca53bccf1524ff11a0ac5c85531
diff --git a/trunk/drivers/mmc/mmc.c b/trunk/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/trunk/include/linux/mmc/host.h b/trunk/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;
 };