aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-29 13:19:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-29 13:19:56 -0800
commit5e6c2c97c56eb1b656e27fdcfaa3722828a9eca5 (patch)
tree48169eefa35971660cb589791a6cbd0dda2f44c1
parent4c5d4995030c298db9fe0db00693a4641243cd9e (diff)
parent1c2d26e379fc8d37d55befd8589c4c252186ee58 (diff)
downloadlinux-linaro-stable-5e6c2c97c56eb1b656e27fdcfaa3722828a9eca5.tar.gz
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
-rw-r--r--drivers/mmc/core/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 02ad79229f65..7466ce098e60 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -886,7 +886,7 @@ static int mmc_select_bus_width(struct mmc_card *card)
unsigned idx, bus_width = 0;
int err = 0;
- if (!mmc_can_ext_csd(card) &&
+ if (!mmc_can_ext_csd(card) ||
!(host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA)))
return 0;