mtd: rawnand: atmel: Fix error handling path in atmel_nand_controller_add_nands

[ Upstream commit 8ed4728eb9f10b57c3eb02e0f6933a89ffcb8a91 ]

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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 78f317ac04afaa7d484cbe88ca946fcd4d2f3443..56fd897721ad5b684d1779e6c20ecfc29fd0bea5 100644 (file)
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1859,7 +1859,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;
@@ -1886,7 +1886,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);