Commit fb49454b authored by Scott Wood's avatar Scott Wood
Browse files

nand: reinstate lazy bad block scanning

commit 2a8e0fc8 ("nand: Merge changes
from Linux nand driver") accidentally reverted commit
13f0fd94 ("NAND: Scan bad blocks
lazily.").

Reinstate the change, as amended by commit
ff49ea89

 ("NAND: Mark the BBT as scanned
prior to calling scan_bbt.").
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 1f7b1743
......@@ -479,6 +479,11 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
{
struct nand_chip *chip = mtd->priv;
if (!(chip->options & NAND_BBT_SCANNED)) {
chip->options |= NAND_BBT_SCANNED;
chip->scan_bbt(mtd);
}
if (!chip->bbt)
return chip->block_bad(mtd, ofs, getchip);
......@@ -3166,10 +3171,9 @@ int nand_scan_tail(struct mtd_info *mtd)
/* Check, if we should skip the bad block table scan */
if (chip->options & NAND_SKIP_BBTSCAN)
return 0;
chip->options |= NAND_BBT_SCANNED;
/* Build bad block table */
return chip->scan_bbt(mtd);
return 0;
}
/**
......
......@@ -232,6 +232,8 @@ typedef enum {
#define NAND_CREATE_EMPTY_BBT 0x01000000
/* Options set by nand scan */
/* bbt has already been read */
#define NAND_BBT_SCANNED 0x40000000
/* Nand scan has allocated controller struct */
#define NAND_CONTROLLER_ALLOC 0x80000000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment