mtd/drivers/mtd/nand nand_base.c,1.159,1.160

[Vitaly Wool]

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

Modified Files:
	nand_base.c 
Log Message:
[MTD] NAND: Fix page write verify for nand_write_oob

Fixing typos: a) bitwise 'or' -> logical 'or' b) buf -> oob_buf



Index: nand_base.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_base.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- nand_base.c	2 Dec 2005 14:34:31 -0000	1.159
+++ nand_base.c	5 Dec 2005 16:39:19 -0000	1.160
@@ -2026,11 +2026,11 @@
 	*retlen = len;
 
 #ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-	if (this->eccmode == NAND_ECC_SOFT | this->eccmode == NAND_ECC_NONE) {
+	if (this->eccmode == NAND_ECC_SOFT || this->eccmode == NAND_ECC_NONE) {
 		/* Send command to read back the data */
 		this->cmdfunc (mtd, NAND_CMD_READOOB, column, page & this->pagemask);
 
-		if (this->verify_buf(mtd, buf, len)) {
+		if (this->verify_buf(mtd, oob_buf, len)) {
 			DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write verify, page 0x%08x\n", page);
 			ret = -EIO;
 			goto out;