[PATCH] mtd: nand: gpmi: use correct member for checking NAND_BBT_USE_FLASH

[Huang Shijie]

于 2012年01月31日 20:10, Wolfram Sang 写道:
> 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.
>
> Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
> Cc: Huang Shijie <b32955 at freescale.com>
> ---
>
> Artem: NAND_OWN_BUFFERS should not get set, so no danger. But I'd think we
> should add the stable tag nonetheless if Huang is fine with this change.
>
>  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);
Acked-by: Huang Shijie <b32955 at freescale.com>


I noticed this too.

thanks a lot.

Huang Shijie