This is necessary to prevent the imx_nand_bbm command to bail out on ECC errors which leaves the device without BBT. Also simplify buffer management: Use on-stack buffer instead of malloc. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> --- drivers/mtd/nand/nand_imx_bbm.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/nand/nand_imx_bbm.c b/drivers/mtd/nand/nand_imx_bbm.c index 251dfe5d3f12..eb3318c08aa6 100644 --- a/drivers/mtd/nand/nand_imx_bbm.c +++ b/drivers/mtd/nand/nand_imx_bbm.c @@ -52,12 +52,20 @@ * on the flash BBT. * */ -static int checkbad(struct mtd_info *mtd, loff_t ofs, void *__buf) +static int checkbad(struct mtd_info *mtd, loff_t ofs) { int ret, retlen; - uint8_t *buf = __buf; + uint8_t buf[mtd->writesize + mtd->oobsize]; + struct mtd_oob_ops ops; - ret = mtd->read(mtd, ofs, mtd->writesize, &retlen, buf); + ops.mode = MTD_OPS_RAW; + ops.ooboffs = 0; + ops.datbuf = buf; + ops.len = mtd->writesize; + ops.oobbuf = buf + mtd->writesize; + ops.ooblen = mtd->oobsize; + + ret = mtd_read_oob(mtd, ofs, &ops); if (ret < 0) return ret; @@ -88,18 +96,12 @@ static void *create_bbt(struct mtd_info *mtd) if (!bbt) return ERR_PTR(-ENOMEM); - buf = malloc(mtd->writesize); - if (!buf) { - ret = -ENOMEM; - goto out2; - } - numblocks = mtd->size >> (chip->bbt_erase_shift - 1); for (i = 0; i < numblocks;) { - ret = checkbad(mtd, from, buf); + ret = checkbad(mtd, from); if (ret < 0) - goto out1; + goto out; if (ret) { bbt[i >> 3] |= 0x03 << (i & 0x6); @@ -113,9 +115,7 @@ static void *create_bbt(struct mtd_info *mtd) return bbt; -out1: - free(buf); -out2: +out: free(bbt); return ERR_PTR(ret); -- 2.8.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox