Commit 35c204d8 authored by Rostislav Lisovy's avatar Rostislav Lisovy Committed by Scott Wood
Browse files

nand: reinstate lazy bad block scanning

Commit ff94bc40
("mtd, ubi, ubifs: resync with Linux-3.14")
accidentally reverted part of the commit
13f0fd94
("NAND: Scan bad blocks lazily.").

Reinstate the change as by commit
fb49454b


("nand: reinstate lazy bad block scanning")
Signed-off-by: default avatarRostislav Lisovy <lisovy@merica.cz>
Acked-by: default avatarHeiko Schocher <hs@denx.de>
parent 85bafb6d
......@@ -634,6 +634,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->scan_bbt(mtd);
chip->options |= NAND_BBT_SCANNED;
}
if (!chip->bbt)
return chip->block_bad(mtd, ofs, getchip);
......@@ -4322,10 +4327,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;
}
EXPORT_SYMBOL(nand_scan_tail);
......
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