When specified in the flags argument of nand_write, WITH_YAFFS_OOB causes an operation which is mutually exclusive with the 'usual' way of writing.
Add a check that client code does not specify WITH_YAFFS_OOB along with any other flags and add a comment indicating that the WITH_YAFFS_OOB flag should not be mixed with other flags.
Signed-off-by: Ben Gardiner bengardiner@nanometrics.ca CC: Scott Wood scottwood@freescale.com
---
Changes since v3: * none. This patch was introduced in v4 to adress Scott Wood's v3 review comments.
--- drivers/mtd/nand/nand_util.c | 3 +++ include/nand.h | 4 +++- 2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 762ac53..e4ef858 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -461,6 +461,9 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
#ifdef CONFIG_CMD_NAND_YAFFS if (flags & WITH_YAFFS_OOB) { + if (flags & ~WITH_YAFFS_OOB) + return -EINVAL; + int pages; pages = nand->erasesize / nand->writesize; blocksize = (pages * nand->oobsize) + nand->erasesize; diff --git a/include/nand.h b/include/nand.h index b0a31b8..c5818f1 100644 --- a/include/nand.h +++ b/include/nand.h @@ -115,7 +115,9 @@ typedef struct nand_erase_options nand_erase_options_t; int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer);
-#define WITH_YAFFS_OOB (1 << 0) /* whether write with yaffs format */ +#define WITH_YAFFS_OOB (1 << 0) /* whether write with yaffs format. This flag + * is a 'mode' meaning it cannot be mixed with + * other flags */
int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer, int flags);