Messages in this thread Patch in this message | | | From | Wei Yongjun <> | Subject | [PATCH -next] mtd: spinand: Fix missing unlock on error path | Date | Wed, 4 Jul 2018 08:29:39 +0000 |
| |
Add the missing unlock before return from function spinand_mtd_(read|write) in the error handling case.
Fixes: c898e0526fb6 ("mtd: nand: Add core infrastructure to support SPI NANDs") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/mtd/nand/spi/core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 17d207a..8ac1ba95 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -560,12 +560,16 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from, nanddev_io_for_each_page(nand, from, ops, &iter) { ret = spinand_select_target(spinand, iter.req.pos.target); - if (ret) + if (ret) { + mutex_unlock(&spinand->lock); return ret; + } ret = spinand_ecc_enable(spinand, enable_ecc); - if (ret) + if (ret) { + mutex_unlock(&spinand->lock); return ret; + } ret = spinand_read_page(spinand, &iter.req, enable_ecc); if (ret < 0 && ret != -EBADMSG) @@ -609,11 +613,11 @@ static int spinand_mtd_write(struct mtd_info *mtd, loff_t to, nanddev_io_for_each_page(nand, to, ops, &iter) { ret = spinand_select_target(spinand, iter.req.pos.target); if (ret) - return ret; + break; ret = spinand_ecc_enable(spinand, enable_ecc); if (ret) - return ret; + break; ret = spinand_write_page(spinand, &iter.req); if (ret)
| |