Commit 04459710 authored Sep 06, 2019 by Linus Torvalds

Merge tag 'mmc-v5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Revert in order to fix card init for some eMMCs that need retries for
  CMD6"

* tag 'mmc-v5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  Revert "mmc: core: do not retry CMD6 in __mmc_switch()"

parents 08d433d8 8ad8e02c

drivers/mmc/core/mmc_ops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
		if (index == EXT_CSD_SANITIZE_START)
		cmd.sanitize_busy = true;

		err = mmc_wait_for_cmd(host, &cmd, 0);
		err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
		if (err)
		goto out;

Admin message