git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
mmc
/
core
/
core.c
diff --git
a/drivers/mmc/core/core.c
b/drivers/mmc/core/core.c
index
68091dd
..
7843efe
100644
(file)
--- 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;