Commit 1c2d26e3 authored Dec 17, 2014 by Alexandre Belloni Committed by Ulf Hansson Dec 29, 2014

mmc: core: stop trying to switch width when only one bit is supported



mmc_select_bus_width() will try to switch to MMC_BUS_WIDTH_4 even if
MMC_CAP_4_BIT_DATA and MMC_CAP_8_BIT_DATA are not set in host->caps.
Return as soon as possible when those flags are not set

Fixes: 577fb131 (mmc: rework selection of bus speed mode)
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: <stable@vger.kernel.org> # 3.17
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 97bf6af1

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;

Admin message