diff options
author | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
commit | e55d4fa96762fd767a3b6d842c904e994db6bb2e (patch) | |
tree | c74157e01cb128cb97f106a50cfadc4c8b872c41 /drivers/mmc/core/core.c | |
parent | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (diff) | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) |
Merge commit 'v3.0-rc5' into android-3.0
Diffstat (limited to 'drivers/mmc/core/core.c')
-rw-r--r-- | drivers/mmc/core/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index a854a786100..7c3444a3707 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1281,7 +1281,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; |