New subject: mtd: spinand: Fix the error/cleanup path in spinand_init()

24 Jan 2019

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: 7529df465248 ("mtd: nand: Add core infrastructure to support SPI NANDs")
Cc: stable@vger.kernel.org
Signed-off-by: Boris Brezillon bbrezillon@kernel.org
---
 drivers/mtd/nand/spi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
index 8bf37da19663..fa87ae28cdfe 100644
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@@ -1016,11 +1016,11 @@ static int spinand_init(struct spinand_device *spinand)
    for (i = 0; i < nand->memorg.ntargets; i++) {
    	ret = spinand_select_target(spinand, i);
    	if (ret)
-			goto err_free_bufs;
+			goto err_manuf_cleanup;
ret = spinand_lock_block(spinand, BL_ALL_UNLOCKED);
    	if (ret)
-			goto err_free_bufs;
+			goto err_manuf_cleanup;
    }
ret = nanddev_init(nand, &spinand_ops, THIS_MODULE);
-- 
2.17.1


    

[PATCH] mtd: spinand: Fix the error/cleanup path in spinand_init()