diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2016-06-08 11:27:52 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-07-25 10:34:12 +0200 |
| commit | 8b7be8f2e7fe6c037fc7c89029a4a568ad2c60b1 (patch) | |
| tree | 39ca75122f14d59213b43496d31cae19c0cd7807 | |
| parent | c6d8fd61c096e9f84c0bd0bc38ccf5856b76c772 (diff) | |
| download | kernel_i9300_mainline-8b7be8f2e7fe6c037fc7c89029a4a568ad2c60b1.zip kernel_i9300_mainline-8b7be8f2e7fe6c037fc7c89029a4a568ad2c60b1.tar.gz kernel_i9300_mainline-8b7be8f2e7fe6c037fc7c89029a4a568ad2c60b1.tar.bz2 | |
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: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -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 900b9f9..ccab9bb 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -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; |