mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
Merge branch 'fixes' into next
This commit is contained in:
commit
006cac8262
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue