mtd/drivers/mtd mtdconcat.c,1.6,1.7

[David Woodhouse]

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

Modified Files:
	mtdconcat.c 
Log Message:
Fix ecc/oob subdev comparisions


Index: mtdconcat.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/mtdconcat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mtdconcat.c	25 Jun 2003 12:37:50 -0000	1.6
+++ mtdconcat.c	29 Jun 2003 21:26:34 -0000	1.7
@@ -711,14 +711,14 @@
 				    subdev[i]->flags & MTD_WRITEABLE;
 		}
 		concat->mtd.size += subdev[i]->size;
-		if (concat->mtd.oobblock != subdev[i]->oobblock ||
-		    concat->mtd.oobsize != subdev[i]->oobsize ||
-		    concat->mtd.ecctype != subdev[i]->ecctype ||
-		    concat->mtd.eccsize != subdev[i]->eccsize ||
-		    !concat->mtd.read_ecc != !concat->mtd.read_ecc ||
-		    !concat->mtd.write_ecc != !concat->mtd.write_ecc ||
-		    !concat->mtd.read_oob != !concat->mtd.read_oob ||
-		    !concat->mtd.write_oob != !concat->mtd.write_oob) {
+		if (concat->mtd.oobblock   !=  subdev[i]->oobblock ||
+		    concat->mtd.oobsize    !=  subdev[i]->oobsize ||
+		    concat->mtd.ecctype    !=  subdev[i]->ecctype ||
+		    concat->mtd.eccsize    !=  subdev[i]->eccsize ||
+		    !concat->mtd.read_ecc  != !subdev[i]->mtd.read_ecc ||
+		    !concat->mtd.write_ecc != !subdev[i]->mtd.write_ecc ||
+		    !concat->mtd.read_oob  != !subdev[i]->mtd.read_oob ||
+		    !concat->mtd.write_oob != !subdev[i]->mtd.write_oob) {
 			kfree(concat);
 			printk("Incompatible OOB or ECC data on \"%s\"\n",
 			       subdev[i]->name);