Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abb9cf78 authored by Brian Norris's avatar Brian Norris
Browse files

mtd: nand_bbt: handle error case for nand_create_badblock_pattern()

parent 930de537
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -1282,6 +1282,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) {
@@ -1300,8 +1301,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);
}