diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /drivers/mmc/core/core.c | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'drivers/mmc/core/core.c')
| -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) | |||
| 706 | * This delay should be sufficient to allow the power supply | 706 | * This delay should be sufficient to allow the power supply |
| 707 | * to reach the minimum voltage. | 707 | * to reach the minimum voltage. |
| 708 | */ | 708 | */ |
| 709 | mmc_delay(2); | 709 | mmc_delay(10); |
| 710 | 710 | ||
| 711 | host->ios.clock = host->f_min; | 711 | host->ios.clock = host->f_min; |
| 712 | host->ios.power_mode = MMC_POWER_ON; | 712 | host->ios.power_mode = MMC_POWER_ON; |
| @@ -716,7 +716,7 @@ static void mmc_power_up(struct mmc_host *host) | |||
| 716 | * This delay must be at least 74 clock sizes, or 1 ms, or the | 716 | * This delay must be at least 74 clock sizes, or 1 ms, or the |
| 717 | * time required to reach a stable voltage. | 717 | * time required to reach a stable voltage. |
| 718 | */ | 718 | */ |
| 719 | mmc_delay(2); | 719 | mmc_delay(10); |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | static void mmc_power_off(struct mmc_host *host) | 722 | static void mmc_power_off(struct mmc_host *host) |