Re: [PATCH 1/5] mtd: Initialize ->fail_addr early in mtd_erase()

From
Richard Weinberger <richard@nod.at>
Date
2018-02-12 21:53:38
Also in
netdev
Reply to
Boris Brezillon, 2018-02-12
Am Montag, 12. Februar 2018, 22:03:07 CET schrieb Boris Brezillon:
quoted hunk ↗ jump to hunk
mtd_erase() can return an error before ->fail_addr is initialized to
MTD_FAIL_ADDR_UNKNOWN. Move this initialization at the very beginning
of the function.

Signed-off-by: Boris Brezillon <redacted>
---
 drivers/mtd/mtdcore.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index a1c94526fb88..c87859ff338b 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -953,6 +953,8 @@ EXPORT_SYMBOL_GPL(__put_mtd_device);
  */
 int mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
+	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
+
 	if (!mtd->erasesize || !mtd->_erase)
 		return -ENOTSUPP;
@@ -961,7 +963,6 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info
*instr) if (!(mtd->flags & MTD_WRITEABLE))
 		return -EROFS;

-	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
 	if (!instr->len) {
 		instr->state = MTD_ERASE_DONE;
 		mtd_erase_callback(instr);
Reviewed-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard
Thread (16 messages) 16 messages, 4 authors, last reply 2018-03-18
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help