mtd: spi-nor: fix error handling in spi_nor_erase

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d6af26944a02e6d325b82160d52e08dc4e315396
Commit:     d6af26944a02e6d325b82160d52e08dc4e315396
Parent:     0f6d3f4097d2746925986af5e34b864c5f6b2682
Author:     Heiner Kallweit <hkallweit1 at gmail.com>
AuthorDate: Tue Nov 17 20:18:54 2015 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Fri Dec 4 15:38:47 2015 -0800

    mtd: spi-nor: fix error handling in spi_nor_erase
    
    The documenting comment of mtd_erase in mtdcore.c states:
    Device drivers are supposed to call instr->callback() whenever
    the operation completes, even if it completes with a failure.
    
    Currently the callback isn't called in case of failure. Fix this.
    
    Signed-off-by: Heiner Kallweit <hkallweit1 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index f8a9b77..3b2460e 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -410,17 +410,13 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
 
 	write_disable(nor);
 
+erase_err:
 	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
 
-	instr->state = MTD_ERASE_DONE;
+	instr->state = ret ? MTD_ERASE_FAILED : MTD_ERASE_DONE;
 	mtd_erase_callback(instr);
 
 	return ret;
-
-erase_err:
-	spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
-	instr->state = MTD_ERASE_FAILED;
-	return ret;
 }
 
 static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs,