Even more checkpoint tracing

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 26acf201d76cfd2e6ee09795328b87b45b47d873..14ae3308a79333f419d5ae6e5800237c2b5e77b2 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -13,7 +13,7 @@
  */
  
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.3 2006-10-03 10:13:03 charles Exp $";
+    "$Id: yaffs_nand.c,v 1.5 2006-11-08 09:52:12 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
@@ -45,8 +45,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
        
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-               bi->gcPrioritise = 1;
-               dev->hasPendingPrioritisedGCs = 1;
+                yaffs_HandleChunkError(dev,bi);
        }
                                                                
        return result;
@@ -124,9 +123,6 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
        dev->nBlockErasures++;
        result = dev->eraseBlockInNAND(dev, blockInNAND);
 
-       /* If at first we don't succeed, try again *once*.*/
-       if (!result)
-               result = dev->eraseBlockInNAND(dev, blockInNAND);       
        return result;
 }