diff options
| author | Ben Gardiner <bengardiner@nanometrics.ca> | 2011-06-14 16:35:05 -0400 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-07-01 15:56:51 -0500 |
| commit | c135456ff59aed0302f99a2e1327939bdced77f5 (patch) | |
| tree | abd0162e32cc6f15b1f5c5529090cb83bd984670 /drivers/mtd | |
| parent | a6c9aa1f92dd16a0ec6faeff37069db61d3f7cf3 (diff) | |
| download | blackbird-obmc-uboot-c135456ff59aed0302f99a2e1327939bdced77f5.tar.gz blackbird-obmc-uboot-c135456ff59aed0302f99a2e1327939bdced77f5.zip | |
nand_util: treat WITH_YAFFS_OOB as a mode
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>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 762ac53287..e4ef8588a7 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; |
