diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2016-06-07 13:51:16 +0100 |
|---|---|---|
| committer | Peter Griffin <peter.griffin@linaro.org> | 2016-06-08 11:22:30 +0100 |
| commit | 3d485b25528500b8009ec77835cf7b45a7a69514 (patch) | |
| tree | b68fd72535f2699499938f05a26c1abb60b5f979 | |
| parent | 3ce5af933747202d16bd9cab205f08a6ac34753d (diff) | |
mmc: core: Only change mode if mmc_select_bus_width() is successful.v4.7-rc2-mmc-core-bus-width
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.
Fixes f741494 mmc: fix mmc mode selection for HS-DDR and higher
Fixes: 287980e (remove lots of IS_ERR_VALUE abuses)
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Arnd Bergmann <arnd@arndb.de>
---
v2: Rebase on v4.7-rc2 which includes a fix from Chen-Yu and update
commit message.
| -rw-r--r-- | drivers/mmc/core/mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 5d438ad3ee32..aafb73d080ca 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1276,7 +1276,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, @@ -1583,7 +1583,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; |