Back out mistaken checkin

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 83194814d0b5f06f64d3d06f9f49563f1a792000..5e9e91c8eac44ed4f255088fbeeba5a9ab5e5d89 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -16,7 +16,7 @@
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =

-    "$Id: yaffs_mtdif2.c,v 1.9 2005-12-07 21:49:18 charles Exp $";
+    "$Id: yaffs_mtdif2.c,v 1.10 2005-12-07 22:00:38 charles Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 


@@ -93,8 +93,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
           ("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
 
           ("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
 

-       if (1 ||  /* Always do this */
-           data && tags) {
+       if (data && tags) {

                if (dev->useNANDECC) {
                        retval =
                            mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
                if (dev->useNANDECC) {
                        retval =
                            mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,