diff options
| author | Boris Brezillon | 2019-01-24 15:46:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-15 08:10:10 +0100 |
| commit | a72040a9d929c17dcfb874671b21e4410df4c8c0 (patch) | |
| tree | 3fea06ff6841095d4ca9ae3fcf758ba10fac9525 | |
| parent | mtd: spinand: Handle the case where PROGRAM LOAD does not reset the cache (diff) | |
| download | kernel-qcow2-linux-a72040a9d929c17dcfb874671b21e4410df4c8c0.tar.gz kernel-qcow2-linux-a72040a9d929c17dcfb874671b21e4410df4c8c0.tar.xz kernel-qcow2-linux-a72040a9d929c17dcfb874671b21e4410df4c8c0.zip | |
mtd: spinand: Fix the error/cleanup path in spinand_init()
commit c3c7dbf4887ab3ed9d611cd1f6e16937f8700743 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: 7529df465248 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/mtd/nand/spi/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index a78621c7b11d..8c7bf91ce4e1 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -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); |