[PATCH] nand: Fix patch merge problem

Signed-off-by: N Stefan Roese <sr@denx.de>

[PATCH] nand: Fix patch merge problem
Signed-off-by: N Stefan Roese <sr@denx.de>
e7f3e9ff · Stefan Roese · d2c83f54 · e7f3e9ff
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

drivers/nand/nand_base.c drivers/nand/nand_base.c +2 -2

未找到文件。
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -838,9 +838,9 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
 	unsigned long	timeo;

 	if (state == FL_ERASING)
-		timeo += (HZ * 400) / 1000;
+ 		timeo = (CFG_HZ * 400) / 1000;
 	else
-		timeo += (HZ * 20) / 1000;
+		timeo = (CFG_HZ * 20) / 1000;

 	if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
 		this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);