Merge tag 'mmc-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Fix multi-bit bus width without high-speed mode for MMC"

* tag 'mmc-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: fix multi-bit bus width without high-speed mode

parents 7ed1b125 3d4ef329

drivers/mmc/core/mmc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1706,10 +1706,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;