From f4da09645b66fdf954fff01ca8c8a31e83a52d39 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Mon, 12 Mar 2012 04:58:00 -0600
Subject: [PATCH] --- yaml --- r: 298817 b: refs/heads/master c:
 3bdc9ba892d6a294d16e9e6e0c4041926aa3d58c h: refs/heads/master i:   298815:
 37f290704e471c438f67c4c133b2a58594ace3ff v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/core/core.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1f5ddf923b3a..5bcdfad70859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c2fc8e413ecc2c96b696e28d4eb1bc6cee8dc84
+refs/heads/master: 3bdc9ba892d6a294d16e9e6e0c4041926aa3d58c
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index 14f262e9246d..7474c47b9c08 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -527,10 +527,14 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
 
 		if (data->flags & MMC_DATA_WRITE)
 			/*
-			 * The limit is really 250 ms, but that is
-			 * insufficient for some crappy cards.
+			 * The MMC spec "It is strongly recommended
+			 * for hosts to implement more than 500ms
+			 * timeout value even if the card indicates
+			 * the 250ms maximum busy length."  Even the
+			 * previous value of 300ms is known to be
+			 * insufficient for some cards.
 			 */
-			limit_us = 300000;
+			limit_us = 3000000;
 		else
 			limit_us = 100000;