From 1e5b814d4e3adc82a9c586958f7779cda9ddd382 Mon Sep 17 00:00:00 2001
From: vimal singh <vimalsingh@ti.com>
Date: Sat, 27 Jun 2009 11:07:06 +0530
Subject: [PATCH] --- yaml --- r: 154737 b: refs/heads/master c:
 c276aca46d26aa2347320096f8ecdf5016795c14 h: refs/heads/master i:   154735:
 e1d2cac8ff706f26be6ea0b3521aab9fd8c44bd2 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mtd/nand/omap2.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd57807f3fee..20db15973c69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70ec3bb8ea3f8c55b255f41d122c7d4d8c0d00b4
+refs/heads/master: c276aca46d26aa2347320096f8ecdf5016795c14
diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c
index 0cd76f89f4b0..ebd07e95b814 100644
--- a/trunk/drivers/mtd/nand/omap2.c
+++ b/trunk/drivers/mtd/nand/omap2.c
@@ -11,6 +11,8 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/sched.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -541,7 +543,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
 							mtd);
 	unsigned long timeo = jiffies;
-	int status, state = this->state;
+	int status = NAND_STATUS_FAIL, state = this->state;
 
 	if (state == FL_ERASING)
 		timeo += (HZ * 400) / 1000;
@@ -556,8 +558,9 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip *chip)
 
 	while (time_before(jiffies, timeo)) {
 		status = __raw_readb(this->IO_ADDR_R);
-		if (!(status & 0x40))
+		if (status & NAND_STATUS_READY)
 			break;
+		cond_resched();
 	}
 	return status;
 }