diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:23:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:23:16 -0700 |
| commit | 37ecfd807b82bf547429fe1376e1fe7000ba7cff (patch) | |
| tree | 0d1810bce95fc46505ee7ab529e7795c23ef9c80 /drivers/mmc/core | |
| parent | 71019c350aca8fe650246988e64bfd2c89192180 (diff) | |
| parent | 2e058a6fb004a6b6c3eb6a219ae408f83b670598 (diff) | |
| download | blackbird-op-linux-37ecfd807b82bf547429fe1376e1fe7000ba7cff.tar.gz blackbird-op-linux-37ecfd807b82bf547429fe1376e1fe7000ba7cff.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mvsdio: fix CONFIG_PM=y build
mmci: fix crash with debug enabled
sdhci: catch ADMA errors
mmc: increase power up delay
sdhci-pci: bad error handling in probe function
mmc_block: be prepared for oversized requests
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index fa073ab3fa34..264911732756 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -706,7 +706,7 @@ static void mmc_power_up(struct mmc_host *host) * This delay should be sufficient to allow the power supply * to reach the minimum voltage. */ - mmc_delay(2); + mmc_delay(10); host->ios.clock = host->f_min; host->ios.power_mode = MMC_POWER_ON; @@ -716,7 +716,7 @@ static void mmc_power_up(struct mmc_host *host) * This delay must be at least 74 clock sizes, or 1 ms, or the * time required to reach a stable voltage. */ - mmc_delay(2); + mmc_delay(10); } static void mmc_power_off(struct mmc_host *host) |
