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

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
...@@ -1334,7 +1334,7 @@ static int mmc_select_hs200(struct mmc_card *card) ...@@ -1334,7 +1334,7 @@ static int mmc_select_hs200(struct mmc_card *card)
* switch to HS200 mode if bus width is set successfully. * switch to HS200 mode if bus width is set successfully.
*/ */
err = mmc_select_bus_width(card); err = mmc_select_bus_width(card);
if (err >= 0) { if (err > 0) {
val = EXT_CSD_TIMING_HS200 | val = EXT_CSD_TIMING_HS200 |
card->drive_strength << EXT_CSD_DRV_STR_SHIFT; card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
...@@ -1642,7 +1642,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -1642,7 +1642,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
} else if (mmc_card_hs(card)) { } else if (mmc_card_hs(card)) {
/* Select the desired bus width optionally */ /* Select the desired bus width optionally */
err = mmc_select_bus_width(card); err = mmc_select_bus_width(card);
if (err >= 0) { if (err > 0) {
err = mmc_select_hs_ddr(card); err = mmc_select_hs_ddr(card);
if (err) if (err)
goto free_card; goto free_card;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment