diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
| commit | f64075972b8dc4ec4a701506e5fe8075113d3c4a (patch) | |
| tree | e8c13889eec312fcb7e32ed040017a16204bd005 /drivers/mtd | |
| parent | e54183d6d4eb575051e67a020094787c113f238d (diff) | |
| parent | b06ecabed947ed778ee2f271c0cb0cc8c4483f5d (diff) | |
| download | barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.gz barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 670720a284..426ad9bf8b 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -445,10 +445,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip, { struct nand_chip *chip = mtd->priv; - if (IS_ENABLED(CONFIG_NAND_BBT)) { - if (!chip->bbt) - return chip->block_bad(mtd, ofs, getchip); - + if (IS_ENABLED(CONFIG_NAND_BBT) && chip->bbt) { /* Return info from the table */ return nand_isbad_bbt(mtd, ofs, allowbbt); } |