Commit 006cac82 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents efff8e78 3d4ef329

drivers/mmc/core/mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE