mtd/drivers/mtd/nand nand_base.c,1.115,1.116

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv11956

Modified Files:
	nand_base.c 
Log Message:
Check for r/b pin only, if available

Index: nand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_base.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- nand_base.c	9 Aug 2004 13:19:45 -0000	1.115
+++ nand_base.c	30 Aug 2004 18:00:45 -0000	1.116
@@ -761,11 +761,11 @@
 		}
 		if (this->dev_ready) {
 			if (this->dev_ready(mtd))
+				break;	
+		} else {
+			if (this->read_byte(mtd) & NAND_STATUS_READY)
 				break;
 		}
-		if (this->read_byte(mtd) & NAND_STATUS_READY)
-			break;
-						
 		spin_unlock_bh (&this->chip_lock);
 		yield ();
 		spin_lock_bh (&this->chip_lock);