Commit 5289966e authored Jan 31, 2012 by Wolfram Sang Committed by David Woodhouse Mar 27, 2012

mtd: nand: gpmi: use correct member for checking NAND_BBT_USE_FLASH



This has been moved from .options to .bbt_options meanwhile. So, it
currently checks for something totally different (NAND_OWN_BUFFERS) and
decides according to that.

Artem Bityutskiy: the options were moved in
a40f7341 mtd: nand: consolidate redundant flash-based BBT flags

Artem Bityutskiy: CCing -stable

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: stable@kernel.org [3.2+]
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent b54f47c8

drivers/mtd/nand/gpmi-nand/gpmi-nand.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1124,7 +1124,7 @@ static int gpmi_block_markbad(struct mtd_info *mtd, loff_t ofs)
		chip->bbt[block >> 2] \|= 0x01 << ((block & 0x03) << 1);

		/* Do we have a flash based bad block table ? */
		if (chip->options & NAND_BBT_USE_FLASH)
		if (chip->bbt_options & NAND_BBT_USE_FLASH)
		ret = nand_update_bbt(mtd, ofs);
		else {
		chipnr = (int)(ofs >> chip->chip_shift);