From da7797b2ca558347d2f6862ede2ca96a1fee20ce Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 6 Jun 2008 12:52:39 +0000 Subject: [kernel] generic-2.6: sync yaffs code with the official CVS tree git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11378 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c') diff --git a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c index 7622b1af7..ab756d06d 100644 --- a/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c +++ b/target/linux/generic-2.6/files-2.6.25/fs/yaffs2/yaffs_tagscompat.c @@ -14,6 +14,7 @@ #include "yaffs_guts.h" #include "yaffs_tagscompat.h" #include "yaffs_ecc.h" +#include "yaffs_getblockinfo.h" static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND); #ifdef NOTYET @@ -438,7 +439,7 @@ int yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(yaffs_Device * dev, yaffs_ECCResult eccResult; static yaffs_Spare spareFF; - static int init; + static int init = 0; if (!init) { memset(&spareFF, 0xFF, sizeof(spareFF)); @@ -497,9 +498,9 @@ int yaffs_TagsCompatabilityMarkNANDBlockBad(struct yaffs_DeviceStruct *dev, } int yaffs_TagsCompatabilityQueryNANDBlock(struct yaffs_DeviceStruct *dev, - int blockNo, yaffs_BlockState * - state, - int *sequenceNumber) + int blockNo, + yaffs_BlockState *state, + __u32 *sequenceNumber) { yaffs_Spare spare0, spare1; -- cgit v1.2.3