mtd: spinand: Fix the error/cleanup path in spinand_init() (c3c7dbf4) · Commits · 戴 / test

The manufacturer specific initialization has already been done when block unlocking takes place, and if anything goes wrong during this procedure we should call spinand_manufacturer_cleanup(). Fixes: ("mtd: nand: Add core infrastructure to support SPI NANDs") Cc: <stable@vger.kernel.org> Signed-off-by:

Boris Brezillon <bbrezillon@kernel.org> Acked-by:

Miquel Raynal <miquel.raynal@bootlin.com>

drivers/mtd/nand/spi/core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1016,11 +1016,11 @@ static int spinand_init(struct spinand_device *spinand)
	for (i = 0; i < nand->memorg.ntargets; i++) {		for (i = 0; i < nand->memorg.ntargets; i++) {
	ret = spinand_select_target(spinand, i);		ret = spinand_select_target(spinand, i);
	if (ret)		if (ret)
	goto err_free_bufs;		goto err_manuf_cleanup;

	ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED);		ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED);
	if (ret)		if (ret)
	goto err_free_bufs;		goto err_manuf_cleanup;
	}		}

	ret = nanddev_init(nand, &spinand_ops, THIS_MODULE);		ret = nanddev_init(nand, &spinand_ops, THIS_MODULE);

Admin message