p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-02-14 09:17:37 +01:00
parent efff8e7879 3d4ef32975
commit 006cac8262
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/core/mmc.c
View File

@ -1740,10 +1740,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
err = mmc_select_hs400(card); err = mmc_select_hs400(card);
if (err) if (err)
goto free_card; goto free_card;
} else if (mmc_card_hs(card)) { } else {
/* 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 && mmc_card_hs(card)) {
err = mmc_select_hs_ddr(card); err = mmc_select_hs_ddr(card);
if (err) if (err)
goto free_card; goto free_card;