diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-01-31 13:10:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:33:46 -0700 |
| commit | 496a4138c1575d40c4578a74da7cdda3d8b2a095 (patch) | |
| tree | 42b6b206e31011de9d6c45dc979b2ec0febc4a50 | |
| parent | 7cc1b0b2fea66ee8d4ee4a1aacafb543168db914 (diff) | |
| download | lwn-496a4138c1575d40c4578a74da7cdda3d8b2a095.tar.gz lwn-496a4138c1575d40c4578a74da7cdda3d8b2a095.zip | |
mtd: nand: gpmi: use correct member for checking NAND_BBT_USE_FLASH
commit 5289966ea576a062b80319975b31b661c196ff9d upstream.
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
a40f734 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>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 493ec2fcf97f..f39f83e2e971 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -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); |