* [PATCH 3/3] mtd: spi-nor: fix error handling in spi_nor_erase
@ 2015-11-17 19:18 Heiner Kallweit
2015-12-04 23:40 ` Brian Norris
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2015-11-17 19:18 UTC (permalink / raw)
To: Brian Norris; +Cc: linux-mtd
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>
---
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 4988390..b4d6e93 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -387,17 +387,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,
--
2.6.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3/3] mtd: spi-nor: fix error handling in spi_nor_erase
2015-11-17 19:18 [PATCH 3/3] mtd: spi-nor: fix error handling in spi_nor_erase Heiner Kallweit
@ 2015-12-04 23:40 ` Brian Norris
0 siblings, 0 replies; 2+ messages in thread
From: Brian Norris @ 2015-12-04 23:40 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: linux-mtd
On Tue, Nov 17, 2015 at 08:18:54PM +0100, Heiner Kallweit wrote:
> 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>
Applied patch 3 to l2-mtd.git. Thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-04 23:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-17 19:18 [PATCH 3/3] mtd: spi-nor: fix error handling in spi_nor_erase Heiner Kallweit
2015-12-04 23:40 ` Brian Norris
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.