---

yaml --- r: 332814 b: refs/heads/master c: 3339d1e h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · c1d677b · c1d677b
1 parent e5510a7
commit c1d677b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c179a98a0755b98153e8f4ae08243fbfcd18ff
+refs/heads/master: 3339d1e33185798a45dbdb5ea6c0bec1c27ca5fd
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
@@ -2053,6 +2053,11 @@ void mmc_rescan(struct work_struct *work)
 	if (host->rescan_disable)
 		return;
 
+	/* If there is a non-removable card registered, only scan once */
+	if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
+		return;
+	host->rescan_entered = 1;
+
 	mmc_bus_get(host);
 
 	/*

diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h
@@ -300,6 +300,7 @@ struct mmc_host {
 #endif
 
 	int			rescan_disable;	/* disable card detection */
+	int			rescan_entered;	/* used with nonremovable devices */
 
 	struct mmc_card		*card;		/* device attached to this host */
-Original file line number
+Diff line change
@@ Expand Up / @@ -300,6 +300,7 @@ struct mmc_host { @@
     #endif
     	int			rescan_disable;	/* disable card detection */
+    	int			rescan_entered;	/* used with nonremovable devices */
     	struct mmc_card		*card;		/* device attached to this host */
@@ Expand Down @@