Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-02-14 09:17:37 +01:00
commit 006cac8262

View File

@ -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;