From 8869dada6e3d78683f64d488f6bd05ebcd21dc70 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@intel.com>
Date: Thu, 23 Jun 2011 13:40:27 +0300
Subject: [PATCH] --- yaml --- r: 254092 b: refs/heads/master c:
 4cf8c6dd2e261da94b87c4deadcc136ab022b6ac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dfcd38ef7f5a..03c116a585bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd6fa7e794e62af3ec3eb4ffdc78489885701f2
+refs/heads/master: 4cf8c6dd2e261da94b87c4deadcc136ab022b6ac
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index 68091dda3f31..7843efe22359 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -1245,7 +1245,7 @@ static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,
 		 */
 		timeout_clks <<= 1;
 		timeout_us += (timeout_clks * 1000) /
-			      (card->host->ios.clock / 1000);
+			      (mmc_host_clk_rate(card->host) / 1000);
 
 		erase_timeout = timeout_us / 1000;