diff options
| author |   Adrian Hunter <adrian.hunter@intel.com> | 2011-06-23 13:40:27 +0300 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2011-06-25 18:52:53 -0400 |
| commit | 4cf8c6dd2e261da94b87c4deadcc136ab022b6ac (patch) | |
| tree | 5bad08b6490c694b60d8c4afc0ab638ccea838ff /drivers/mmc | |
| parent | mmc: block: switch card to User Data Area when removing the block driver (diff) | |
| download | linux-dev-4cf8c6dd2e261da94b87c4deadcc136ab022b6ac.tar.xz linux-dev-4cf8c6dd2e261da94b87c4deadcc136ab022b6ac.zip | |
mmc: core: make erase timeout calculation allow for gated clock
The erase timeout calculation may depend on clock rate
which is zero if the clock is gated, so use
mmc_host_clk_rate() which allows for that case.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -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 68091dda3f31..7843efe22359 100644 --- a/drivers/mmc/core/core.c +++ b/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; |