diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-10-28 22:24:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-14 20:20:27 +0100 |
| commit | d806765bd117ddf5db47fa652be818bd607b2d14 (patch) | |
| tree | f556937c02e17aec50865fbade3f979e26f261c1 /drivers/mtd | |
| parent | 33f3c16b56cde630a1de7791a8723905fce6fdb2 (diff) | |
| download | barebox-d806765bd117ddf5db47fa652be818bd607b2d14.tar.gz barebox-d806765bd117ddf5db47fa652be818bd607b2d14.tar.xz | |
mtd: nand_bbt: handle error case for nand_create_badblock_pattern()
Linux commit abb9cf78e80a adapted for Barebox.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 467797b438..dc33f15ba5 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -1278,6 +1278,7 @@ static int nand_create_badblock_pattern(struct nand_chip *this) int nand_default_bbt(struct mtd_info *mtd) { struct nand_chip *this = mtd->priv; + int ret; /* Is a flash based bad block table requested? */ if (this->bbt_options & NAND_BBT_USE_FLASH) { @@ -1296,8 +1297,11 @@ int nand_default_bbt(struct mtd_info *mtd) this->bbt_md = NULL; } - if (!this->badblock_pattern) - nand_create_badblock_pattern(this); + if (!this->badblock_pattern) { + ret = nand_create_badblock_pattern(this); + if (ret) + return ret; + } return nand_scan_bbt(mtd, this->badblock_pattern); } |