---

yaml --- r: 65626 b: refs/heads/master c: e6f918b h: refs/heads/master v: v3
git-mirror · Sep 23, 2007 · a45a14e · a45a14e
1 parent a6ecc9f
commit a45a14e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce252edd869ba1fee6a9a6f83e20f349d4c4d669
+refs/heads/master: e6f918bf39773d712ab5b457bff54ade3bda0cb1
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
@@ -231,6 +231,15 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
 {
 	unsigned int mult;
 
+	/*
+	 * SDIO cards only define an upper 1 s limit on access.
+	 */
+	if (mmc_card_sdio(card)) {
+		data->timeout_ns = 1000000000;
+		data->timeout_clks = 0;
+		return;
+	}
+
 	/*
 	 * SD cards use a 100 multiplier rather than 10
 	 */