Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5e6c2c97c56eb1b656e27fdcfaa3722828a9eca5

Authored by Linus Torvalds
2 parents 4c5d499503 1c2d26e379
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull one MMC fix from Ulf Hansson:
 "MMC core:

   - Fix selection of buswidth for mmc hosts supporting 1-bit only"

* tag 'mmc-v3.19-2' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: core: stop trying to switch width when only one bit is supported

Showing 1 changed file Side-by-side Diff

drivers/mmc/core/mmc.c
Diff comments   View file @ 5e6c2c9
... ... @@ -886,7 +886,7 @@
886 886 unsigned idx, bus_width = 0;
887 887 int err = 0;
888 888  
889   - if (!mmc_can_ext_csd(card) &&
  889 + if (!mmc_can_ext_csd(card) ||
890 890 !(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)))
891 891 return 0;
892 892