---

yaml --- r: 228898 b: refs/heads/master c: 30201e7 h: refs/heads/master v: v3
git-mirror · Jan 9, 2011 · 0cdd317 · 0cdd317
1 parent 9a59efd
commit 0cdd317
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f230f454fe04ba326ffaead3a6b88dcf44eaf4b
+refs/heads/master: 30201e7f3ac639fe98fcd25d40346b65dde9ecba
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
@@ -1506,8 +1506,12 @@ void mmc_rescan(struct work_struct *work)
 
 	mmc_bus_get(host);
 
-	/* if there is a card registered, check whether it is still present */
-	if ((host->bus_ops != NULL) && host->bus_ops->detect && !host->bus_dead)
+	/*
+	 * if there is a _removable_ card registered, check whether it is
+	 * still present
+	 */
+	if (host->bus_ops && host->bus_ops->detect && !host->bus_dead
+	    && mmc_card_is_removable(host))
 		host->bus_ops->detect(host);
 
 	mmc_bus_put(host);