---

yaml --- r: 53572 b: refs/heads/master c: 29041db h: refs/heads/master v: v3
git-mirror · May 1, 2007 · fe281fb · fe281fb
1 parent 11c27e7
commit fe281fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f74d132cec60b686bce1f284822c1a496700bd3c
+refs/heads/master: 29041dbe199b0dff392bf1b9d634357da0b3208f
diff --git a/trunk/drivers/mmc/mmc.c b/trunk/drivers/mmc/mmc.c
@@ -1604,8 +1604,6 @@ static void mmc_rescan(struct work_struct *work)
 		if (!mmc_card_present(card) && !mmc_card_dead(card)) {
 			if (mmc_register_card(card))
 				mmc_card_set_dead(card);
-			else
-				mmc_card_set_present(card);
 		}
 
 		/*

diff --git a/trunk/drivers/mmc/mmc_sysfs.c b/trunk/drivers/mmc/mmc_sysfs.c
@@ -217,6 +217,8 @@ int mmc_register_card(struct mmc_card *card)
 				device_del(&card->dev);
 		}
 	}
+	if (ret == 0)
+		mmc_card_set_present(card);
 	return ret;
 }