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

Commit 431e1eca authored Apr 25, 2011 by Felix Radensky Committed by David Woodhouse May 25, 2011

mtd: mtdconcat: fix NAND OOB write



Currently mtdconcat is broken for NAND. An attemtpt to create
JFFS2 filesystem on concatenation of several NAND devices fails
with OOB write errors. This patch fixes that problem.

Signed-off-by: Felix Radensky <felix@embedded-sol.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: stable@kernel.org
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent a80f1c1f

drivers/mtd/mtdconcat.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@ concat_write_oob(struct mtd_info mtd, loff_t to, struct mtd_oob_ops ops)
		if (!(mtd->flags & MTD_WRITEABLE))
		return -EROFS;

		ops->retlen = 0;
		ops->retlen = ops->oobretlen = 0;

		for (i = 0; i < concat->num_subdev; i++) {
		struct mtd_info *subdev = concat->subdev[i];
		@@ -334,7 +334,7 @@ concat_write_oob(struct mtd_info mtd, loff_t to, struct mtd_oob_ops ops)
		devops.len = subdev->size - to;

		err = subdev->write_oob(subdev, to, &devops);
		ops->retlen += devops.retlen;
		ops->retlen += devops.oobretlen;
		if (err)
		return err;