summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2017-02-14 11:17:37 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2017-02-14 11:17:37 +0300
commit006cac8262987981fb10a0360726875b48123b73 (patch)
tree034fd5326d8fb452ca08fa442be2458ba5f94bc8 /drivers/mmc
parentefff8e7879b8b7f8a077f495262f0bb9cfaa0b06 (diff)
parent3d4ef329757cfd5e0b23cce97cdeca7e2df89c99 (diff)
downloadlinux-006cac8262987981fb10a0360726875b48123b73.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/core/mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e01e70c24ca2..ad1089c713e5 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1740,10 +1740,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
err = mmc_select_hs400(card);
if (err)
goto free_card;
- } else if (mmc_card_hs(card)) {
+ } else {
/* Select the desired bus width optionally */
err = mmc_select_bus_width(card);
- if (err > 0) {
+ if (err > 0 && mmc_card_hs(card)) {
err = mmc_select_hs_ddr(card);
if (err)
goto free_card;