Commit 4fec9c10 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman

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

commit c3c7dbf4 upstream.

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: 7529df46 ("mtd: nand: Add core infrastructure to support SPI NANDs")
Cc: <>
Signed-off-by: default avatarBoris Brezillon <>
Acked-by: default avatarMiquel Raynal <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent e9fb874a
......@@ -1014,11 +1014,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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment