[PATCH] mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands

Erick Karanja posted 1 patch 1 week, 2 days ago
drivers/mtd/nand/raw/atmel/nand-controller.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands
Posted by Erick Karanja 1 week, 2 days ago
In case of a jump to the  err label due to atmel_nand_create() or
atmel_nand_controller_add_nand() failure, the reference to nand_np
need to be released

Use for_each_child_of_node_scoped() to fix the issue.

Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver")

Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
---
 drivers/mtd/nand/raw/atmel/nand-controller.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index db94d14a3807..49e00458eebe 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1858,7 +1858,7 @@ atmel_nand_controller_legacy_add_nands(struct atmel_nand_controller *nc)
 
 static int atmel_nand_controller_add_nands(struct atmel_nand_controller *nc)
 {
-	struct device_node *np, *nand_np;
+	struct device_node *np;
 	struct device *dev = nc->dev;
 	int ret, reg_cells;
 	u32 val;
@@ -1885,7 +1885,7 @@ static int atmel_nand_controller_add_nands(struct atmel_nand_controller *nc)
 
 	reg_cells += val;
 
-	for_each_child_of_node(np, nand_np) {
+	for_each_child_of_node_scoped(np, nand_np) {
 		struct atmel_nand *nand;
 
 		nand = atmel_nand_create(nc, nand_np, reg_cells);
-- 
2.43.0
Re: [PATCH] mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands
Posted by Miquel Raynal 2 days, 11 hours ago
On Mon, 22 Sep 2025 14:07:27 +0300, Erick Karanja wrote:
> In case of a jump to the  err label due to atmel_nand_create() or
> atmel_nand_controller_add_nand() failure, the reference to nand_np
> need to be released
> 
> Use for_each_child_of_node_scoped() to fix the issue.
> 
> Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver")
> 
> [...]

Applied to nand/next, thanks!

[1/1] mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands
      commit: 8ed4728eb9f10b57c3eb02e0f6933a89ffcb8a91

Patche(s) should be available on mtd/linux.git and will be
part of the next PR (provided that no robot complains by then).

Kind regards,
Miquèl