Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96da9606 authored by Vitaly Wool's avatar Vitaly Wool Committed by Linus Torvalds
Browse files

[PATCH] MTD NAND: OOB buffer offset fixups 



In the case of data-pad-ecc-pad-data...  layout the oob start position has
to be sizeof(data) in nand_write_oob_syndrom().

In nand_fill_oob() we need to copy to buf + buffer offset instead of buf +
write offset.

Signed-off-by: default avatarVitaly Wool <vwool@ru.mvista.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20acaa18

drivers/mtd/nand/nand_base.c

+2 −2
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static int nand_write_oob_syndrome(struct mtd_info *mtd, 
		pos = steps * (eccsize + chunk);

		steps = 0;

	} else

		pos = eccsize + chunk;

		pos = eccsize;



	chip->cmdfunc(mtd, NAND_CMD_SEQIN, pos, page);

	for (i = 0; i < steps; i++) {
@@ -1567,7 +1567,7 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob, 
				bytes = min_t(size_t, len, free->length);

				boffs = free->offset;

			}

			memcpy(chip->oob_poi + woffs, oob, bytes);

			memcpy(chip->oob_poi + boffs, oob, bytes);

			oob += bytes;

		}

		return oob;