浏览代码

NAND: Change nand_wait_ready() to not call nand_wait()

This patch changes nand_wait_ready() to not just call nand_wait(),
since this will send a new command to the NAND chip. We just want to
wait for the chip to become ready here.

Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese 17 年之前
父节点
当前提交
1207226452
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      drivers/mtd/nand/nand_base.c

+ 10 - 1
drivers/mtd/nand/nand_base.c

@@ -489,7 +489,16 @@ EXPORT_SYMBOL_GPL(nand_wait_ready);
 void nand_wait_ready(struct mtd_info *mtd)
 {
 	struct nand_chip *chip = mtd->priv;
-	nand_wait(mtd, chip);
+	u32 timeo = (CFG_HZ * 20) / 1000;
+
+	reset_timer();
+
+	/* wait until command is processed or timeout occures */
+	while (get_timer(0) < timeo) {
+		if (chip->dev_ready)
+			if (chip->dev_ready(mtd))
+				break;
+	}
 }
 #endif