From 6b7bb94de75b55cfe8bebd35a989d21a795848cc Mon Sep 17 00:00:00 2001
From: Chris Ball <cjb@laptop.org>
Date: Tue, 22 Sep 2009 16:45:31 -0700
Subject: [PATCH] --- yaml --- r: 164756 b: refs/heads/master c:
 27f6cb160b71b342b7a47d28a4b6c422ea74ccd1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/host/sdhci.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8856f3301697..019a6c494005 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a13abc7b0814da7733c531453a207729b542ecf8
+refs/heads/master: 27f6cb160b71b342b7a47d28a4b6c422ea74ccd1
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
index 9d0767687e12..c279fbc4c2e5 100644
--- a/trunk/drivers/mmc/host/sdhci.c
+++ b/trunk/drivers/mmc/host/sdhci.c
@@ -994,8 +994,8 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 	clk |= SDHCI_CLOCK_INT_EN;
 	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
 
-	/* Wait max 10 ms */
-	timeout = 10;
+	/* Wait max 20 ms */
+	timeout = 20;
 	while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
 		& SDHCI_CLOCK_INT_STABLE)) {
 		if (timeout == 0) {