Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b7be8f2 authored by Peter Griffin's avatar Peter Griffin Committed by Ulf Hansson
Browse files

mmc: core: Only change mode if mmc_select_bus_width() is successful 



mmc_select_bus_width() returns bus width (4 or 8) on success or
zero if unsupported. So only change mode if setting the bus width
is successful.

Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c6d8fd61

drivers/mmc/core/mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ static int mmc_select_hs200(struct mmc_card *card) 
	 * switch to HS200 mode if bus width is set successfully.

	 */

	err = mmc_select_bus_width(card);

	if (err >= 0) {

	if (err > 0) {

		val = EXT_CSD_TIMING_HS200 |

		      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;

		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@@ -1642,7 +1642,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	} else if (mmc_card_hs(card)) {

		/* Select the desired bus width optionally */

		err = mmc_select_bus_width(card);

		if (err >= 0) {

		if (err > 0) {

			err = mmc_select_hs_ddr(card);

			if (err)

				goto free_card;