aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/raw/nand_bbt.c
diff options
context:
space:
mode:
authorFrieder Schrempf <frieder.schrempf@kontron.de>2019-04-17 12:36:36 +0000
committerMiquel Raynal <miquel.raynal@bootlin.com>2019-04-18 08:54:07 +0200
commitbb5925480b13f52ad2e29ab20695c7f27e10f382 (patch)
tree91fad795e040981f555c78465790ea55055342d9 /drivers/mtd/nand/raw/nand_bbt.c
parentmtd: nand: Cleanup flags and fields for bad block marker position (diff)
downloadlinux-dev-bb5925480b13f52ad2e29ab20695c7f27e10f382.tar.xz
linux-dev-bb5925480b13f52ad2e29ab20695c7f27e10f382.zip
mtd: nand: Make flags for bad block marker position more granular
To be able to check and set bad block markers in the first and second page of a block independently of each other, we create separate flags for both cases. Previously NAND_BBM_SECONDPAGE meant, that both, the first and the second page were used. With this patch NAND_BBM_FIRSTPAGE stands for using the first page and NAND_BBM_SECONDPAGE for using the second page. This patch is only for preparation of subsequent changes and does not implement the logic to actually handle both flags separately. Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de> Reviewed-by: Boris Brezillon <bbrezillon@kernel.org> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand/raw/nand_bbt.c')
-rw-r--r--drivers/mtd/nand/raw/nand_bbt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c
index 4915dd7283bb..4cb664847ef5 100644
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@@ -468,7 +468,8 @@ static int create_bbt(struct nand_chip *this, uint8_t *buf,
pr_info("Scanning device for bad blocks\n");
- if (this->options & NAND_BBM_SECONDPAGE)
+ if ((this->options & NAND_BBM_FIRSTPAGE) &&
+ (this->options & NAND_BBM_SECONDPAGE))
numpages = 2;
else
numpages = 1;