diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-12-16 12:30:17 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-12-16 12:30:17 +0100 |
| commit | 7e0b2c32ada813f7f974d53f2cf9845da4d69099 (patch) | |
| tree | 6a8e635aae75155a7ebe50b5028cec8ac7d161b8 /drivers/mmc/host/sdhci.c | |
| parent | mmc: sdhci: Update the tuning failed messages to pr_debug level (diff) | |
| parent | mmc: sdhci: Update the tuning failed messages to pr_debug level (diff) | |
| download | linux-7e0b2c32ada813f7f974d53f2cf9845da4d69099.tar.xz linux-7e0b2c32ada813f7f974d53f2cf9845da4d69099.zip | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d8f1d87c58c6..c04e1ac434f0 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1871,9 +1871,7 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |= SDHCI_CTRL_UHS_SDR104; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_SD_HS || - timing == MMC_TIMING_MMC_HS || - timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50; |