Commit eebe426d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD fix from Richard Weinberger:
 "Fix WAITRDY break condition and timeout in mtk nand driver"

* tag 'fixes-for-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: rawnand: mtk: Fix WAITRDY break condition and timeout
parents 89698bec 2fb164f0

drivers/mtd/nand/raw/mtk_nand.c

+2 −2
Original line number Diff line number Diff line
@@ -488,8 +488,8 @@ static int mtk_nfc_exec_instr(struct nand_chip *chip, 
		return 0;

	case NAND_OP_WAITRDY_INSTR:

		return readl_poll_timeout(nfc->regs + NFI_STA, status,

					  status & STA_BUSY, 20,

					  instr->ctx.waitrdy.timeout_ms);

					  !(status & STA_BUSY), 20,

					  instr->ctx.waitrdy.timeout_ms * 1000);

	default:

		break;

	}