Commit 5e6c2c97 authored Dec 29, 2014 by Linus Torvalds

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

parents 4c5d4995 1c2d26e3

drivers/mmc/core/mmc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;