diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-06 09:01:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-06 09:01:49 -0700 |
| commit | 0445971000375859008414f87e7c72fa0d809cf8 (patch) | |
| tree | 7eb4afe6f513d5c46c6cf2e7ecfce0985d38c6dd | |
| parent | 08d433d8121598f7c2a45f3461c534746b1ed05b (diff) | |
| parent | 8ad8e02c2fa70cfddc1ded53ba9001c9d444075d (diff) | |
| download | linux-stable-0445971000375859008414f87e7c72fa0d809cf8.tar.gz linux-stable-0445971000375859008414f87e7c72fa0d809cf8.tar.bz2 linux-stable-0445971000375859008414f87e7c72fa0d809cf8.zip | |
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()"
| -rw-r--r-- | drivers/mmc/core/mmc_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 74e4364bc9fb..09113b9ad679 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -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; |