[MTD] NAND: Fix nand_default_mark_blockbad() when flash-based BBT disabled
authorRicard Wanderlöf <ricard.wanderlof@axis.com>
Mon, 23 Oct 2006 07:33:34 +0000 (09:33 +0200)
committerDavid Woodhouse <dwmw2@infradead.org>
Thu, 26 Oct 2006 10:17:49 +0000 (13:17 +0300)
When a flash-based BBT is not used, nand_default_mark_blockbad() is supposed
to mark the block bad in the oob. However, it sets the wrong length variable
so that no bad block marker is in fact written. This patch attempts to
rectify that.

(As note, it seems to be that logically, it shouldn't be necessary to set
both length variables, as one appears to be for the main buffer, and
one for the oob buffer, but this is how it is done in several places,
including the code for the mtd character device MEMWRITEOOB and MEMREADOOB
ioctls. I'm not sure if this is a temporary solution during some rework of
the mtd infrastructure, or whether there is a deeper thought here.)

Signed-off-by: Ricard Wanderlöf <ricardw@axis.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
drivers/mtd/nand/nand_base.c

index f23ab2c70433ebabbe62b838afe63b8010bbadad..8df36e2c9a5397d3330775885332b3a435b18cb1 100644 (file)
@@ -362,7 +362,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 * access
                 */
                ofs += mtd->oobsize;
-               chip->ops.len = 2;
+               chip->ops.len = chip->ops.ooblen = 2;
                chip->ops.datbuf = NULL;
                chip->ops.oobbuf = buf;
                chip->ops.ooboffs = chip->badblockpos & ~0x01;