From b4e833b31e83963a4d7d948340f6371c11cfdcea Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 9 Apr 2009 08:32:02 +0200
Subject: [PATCH] --- yaml --- r: 149457 b: refs/heads/master c:
 8dfd0374be84793360db7fff2e635d2cd3bbcb21 h: refs/heads/master i:   149455:
 30189382750cb6da67d6ee49aaadc9c9d8c6b1fa v: v3

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

diff --git a/[refs] b/[refs]
index 3b44ef173f57..c7fb0bb0785d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae628903ab6cc9a04fdf8d4ff3f0c5b2ffa6f939
+refs/heads/master: 8dfd0374be84793360db7fff2e635d2cd3bbcb21
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index 23fb2c39d9ed..d84c880fac84 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -708,7 +708,13 @@ static void mmc_power_up(struct mmc_host *host)
 	 */
 	mmc_delay(10);
 
-	host->ios.clock = host->f_min;
+	if (host->f_min > 400000) {
+		pr_warning("%s: Minimum clock frequency too high for "
+				"identification mode\n", mmc_hostname(host));
+		host->ios.clock = host->f_min;
+	} else
+		host->ios.clock = 400000;
+
 	host->ios.power_mode = MMC_POWER_ON;
 	mmc_set_ios(host);