From: Pierre Ossman <drzeus@drzeus.cx>
Date: Tue, 7 Aug 2007 12:11:55 +0000 (+0200)
Subject: mmc: fix sdio timeout calculation
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=e6f918bf39773d712ab5b457bff54ade3bda0cb1;p=linux-edison.git

mmc: fix sdio timeout calculation

SDIO doesn't have a CSD so it uses different timeout values than
SD memory.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 07c03cb677b..9d29bed820a 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -232,6 +232,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
 	 */
 	mult = mmc_card_sd(card) ? 100 : 10;