Commit 317de3db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.18-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fix from Ulf Hansson:
 "MMC core:

   - Fix busy polling for MMC_SEND_OP_COND again"

* tag 'mmc-v5.18-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: Fix busy polling for MMC_SEND_OP_COND again
parents b851c1f8 e949dee3

drivers/mmc/core/mmc_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#define MMC_BKOPS_TIMEOUT_MS		(120 * 1000) /* 120s */

#define MMC_SANITIZE_TIMEOUT_MS		(240 * 1000) /* 240s */

#define MMC_OP_COND_PERIOD_US		(1 * 1000) /* 1ms */

#define MMC_OP_COND_PERIOD_US		(4 * 1000) /* 4ms */

#define MMC_OP_COND_TIMEOUT_MS		1000 /* 1s */



static const u8 tuning_blk_pattern_4bit[] = {