---

yaml --- r: 312849 b: refs/heads/master c: eb6d5ae h: refs/heads/master i: 312847: 9a22922 v: v3
git-mirror · Jul 22, 2012 · f45b8e0 · f45b8e0
1 parent 7adafef
commit f45b8e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973905feab85416784f36cc94b868392fd465ef4
+refs/heads/master: eb6d5ae1c918cefbfe06f6f96e1a75f2179d82ce
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
@@ -2795,7 +2795,7 @@ int sdhci_add_host(struct sdhci_host *host)
 		mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
 
 	if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
-	    mmc_card_is_removable(mmc))
+	    !(host->mmc->caps & MMC_CAP_NONREMOVABLE))
 		mmc->caps |= MMC_CAP_NEEDS_POLL;
 
 	/* Any UHS-I mode in caps implies SDR12 and SDR25 support. */