diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
commit | c259b35b50096611802dd6da904d664ec4f1a057 (patch) | |
tree | 4de5c4b7528ff05a6f76ba33d18ea2fa8edf543a /target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c | |
parent | 4e9682caacd8c8011e7a8c821b1318478dfdb406 (diff) | |
download | master-187ad058-c259b35b50096611802dd6da904d664ec4f1a057.tar.gz master-187ad058-c259b35b50096611802dd6da904d664ec4f1a057.tar.bz2 master-187ad058-c259b35b50096611802dd6da904d664ec4f1a057.zip |
[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
Diffstat (limited to 'target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c')
-rw-r--r-- | target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c b/target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c index 7622b1af7c..ab756d06d0 100644 --- a/target/linux/generic-2.6/files-2.6.26/fs/yaffs2/yaffs_tagscompat.c +++ b/target/linux/generic-2.6/files-2.6.26/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; |