diff options
| author | Alexander Elbs <alex@segv.de> | 2012-01-03 23:26:53 -0500 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-01-12 15:17:03 -0500 |
| commit | dd8df17fe83483d7ea06ff229895e35a42071599 (patch) | |
| tree | 76d04bc187b622bd4d74e9f038b4871259f717d4 /drivers/mmc | |
| parent | c6ced0db08010ed75df221a2946c5228454b38d5 (diff) | |
| download | linux-3.10-dd8df17fe83483d7ea06ff229895e35a42071599.tar.gz linux-3.10-dd8df17fe83483d7ea06ff229895e35a42071599.tar.bz2 linux-3.10-dd8df17fe83483d7ea06ff229895e35a42071599.zip | |
mmc: sd: Fix SDR12 timing regression
This patch fixes a failure to recognize SD cards reported on a Dell
Vostro with O2 Micro SD card reader. Patch 49c468f ("mmc: sd: add
support for uhs bus speed mode selection") caused the problem, by
setting the SDHCI_CTRL_HISPD flag even for legacy timings.
Signed-off-by: Alexander Elbs <alex@segv.de>
Acked-by: Philip Rakity <prakity@marvell.com>
Acked-by: Arindam Nath <arindam.nath@amd.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 988ae06d1a0..3d338b4b416 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1385,8 +1385,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) if ((ios->timing == MMC_TIMING_UHS_SDR50) || (ios->timing == MMC_TIMING_UHS_SDR104) || (ios->timing == MMC_TIMING_UHS_DDR50) || - (ios->timing == MMC_TIMING_UHS_SDR25) || - (ios->timing == MMC_TIMING_UHS_SDR12)) + (ios->timing == MMC_TIMING_UHS_SDR25)) ctrl |= SDHCI_CTRL_HISPD; ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); |