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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=5289966ea576a062b80319975b31b661c196ff9d
Commit:     5289966ea576a062b80319975b31b661c196ff9d
Parent:     b54f47c8bcfc5f766bf13ec31bd7dd1d4726d33b
Author:     Wolfram Sang <w.sang at pengutronix.de>
AuthorDate: Tue Jan 31 13:10:43 2012 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Tue Mar 27 00:21:33 2012 +0100

    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
    a40f734 mtd: nand: consolidate redundant flash-based BBT flags
    
    Artem Bityutskiy: CCing -stable
    
    Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
    Acked-by: Huang Shijie <b32955 at freescale.com>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Cc: stable at kernel.org [3.2+]
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 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 493ec2f..f39f83e 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);