projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Fix issues kicked up by fuzz testing
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index 9622c664701515e2355e132cf20485fa0f2d9a00..6964ad18c0d567a04ddf404e4d5dcaf09e720a17 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
10
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-11,9
+11,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-const char *yaffs_nand_c_version =
- "$Id: yaffs_nand.c,v 1.12 2010-02-18 01:18:04 charles Exp $";
-
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
@@
-46,7
+43,8
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
if (tags &&
tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
if (tags &&
tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock);
+ yaffs_BlockInfo *bi;
+ bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock);
yaffs_HandleChunkError(dev, bi);
}
yaffs_HandleChunkError(dev, bi);
}
@@
-135,6
+133,7
@@
int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
{
if(dev->param.initialiseNAND)
return dev->param.initialiseNAND(dev);
{
if(dev->param.initialiseNAND)
return dev->param.initialiseNAND(dev);
+ return YAFFS_OK;
}
}