diff options
| author | Heiner Kallweit | 2015-11-17 20:18:54 +0100 |
|---|---|---|
| committer | Brian Norris | 2015-12-05 00:38:47 +0100 |
| commit | d6af26944a02e6d325b82160d52e08dc4e315396 (patch) | |
| tree | 68e9964e91824a040b88539a7ebfc387c87027b7 /drivers/mtd/spi-nor/spi-nor.c | |
| parent | mtd: mtk-quadspi: drop unnecessary .owner assignment (diff) | |
| download | kernel-qcow2-linux-d6af26944a02e6d325b82160d52e08dc4e315396.tar.gz kernel-qcow2-linux-d6af26944a02e6d325b82160d52e08dc4e315396.tar.xz kernel-qcow2-linux-d6af26944a02e6d325b82160d52e08dc4e315396.zip | |
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@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/spi-nor/spi-nor.c')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index f8a9b77aac76..3b2460efc019 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, |