diff options
-rw-r--r-- | drivers/mmc/host/sdhci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f4066fdc8906..6779b4ecab18 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
@@ -584,7 +584,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data) | |||
584 | * longer to time out, but that's much better than having a too-short | 584 | * longer to time out, but that's much better than having a too-short |
585 | * timeout value. | 585 | * timeout value. |
586 | */ | 586 | */ |
587 | if ((host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)) | 587 | if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL) |
588 | return 0xE; | 588 | return 0xE; |
589 | 589 | ||
590 | /* timeout in us */ | 590 | /* timeout in us */ |
@@ -1051,7 +1051,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) | |||
1051 | * At least the Marvell CaFe chip gets confused if we set the voltage | 1051 | * At least the Marvell CaFe chip gets confused if we set the voltage |
1052 | * and set turn on power at the same time, so set the voltage first. | 1052 | * and set turn on power at the same time, so set the voltage first. |
1053 | */ | 1053 | */ |
1054 | if ((host->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)) | 1054 | if (host->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER) |
1055 | sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); | 1055 | sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); |
1056 | 1056 | ||
1057 | pwr |= SDHCI_POWER_ON; | 1057 | pwr |= SDHCI_POWER_ON; |
@@ -1062,7 +1062,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) | |||
1062 | * Some controllers need an extra 10ms delay of 10ms before they | 1062 | * Some controllers need an extra 10ms delay of 10ms before they |
1063 | * can apply clock after applying power | 1063 | * can apply clock after applying power |
1064 | */ | 1064 | */ |
1065 | if ((host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)) | 1065 | if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER) |
1066 | mdelay(10); | 1066 | mdelay(10); |
1067 | } | 1067 | } |
1068 | 1068 | ||