Updated headers so they really are the same

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 26acf201d76cfd2e6ee09795328b87b45b47d873..c33483c3599b8caadd5dd459514ac355ef96bb82 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,7 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -9,11 +9,10 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
  
 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.7 2007-02-14 01:09:06 wookey Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
@@ -45,8 +44,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 +122,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;
 }