| Message ID | 20230907095521.14053-6-Julia.Lawall@inria.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add missing of_node_put | expand |
On Thu, 7 Sept 2023 at 11:55, Julia Lawall <Julia.Lawall@inria.fr> wrote: > > for_each_child_of_node performs an of_node_get on each > iteration, so a break out of the loop requires an > of_node_put. > > This was done using the Coccinelle semantic patch > iterators/for_each_child.cocci > > Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> Applied for next, thanks! Kind regards Uffe > > --- > drivers/mmc/host/atmel-mci.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff -u -p a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -674,8 +674,10 @@ atmci_of_init(struct platform_device *pd > "cd", GPIOD_IN, "cd-gpios"); > err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].detect_pin); > if (err) { > - if (err != -ENOENT) > + if (err != -ENOENT) { > + of_node_put(cnp); > return ERR_PTR(err); > + } > pdata->slot[slot_id].detect_pin = NULL; > } > > @@ -687,8 +689,10 @@ atmci_of_init(struct platform_device *pd > "wp", GPIOD_IN, "wp-gpios"); > err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].wp_pin); > if (err) { > - if (err != -ENOENT) > + if (err != -ENOENT) { > + of_node_put(cnp); > return ERR_PTR(err); > + } > pdata->slot[slot_id].wp_pin = NULL; > } > } >
diff -u -p a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -674,8 +674,10 @@ atmci_of_init(struct platform_device *pd "cd", GPIOD_IN, "cd-gpios"); err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].detect_pin); if (err) { - if (err != -ENOENT) + if (err != -ENOENT) { + of_node_put(cnp); return ERR_PTR(err); + } pdata->slot[slot_id].detect_pin = NULL; } @@ -687,8 +689,10 @@ atmci_of_init(struct platform_device *pd "wp", GPIOD_IN, "wp-gpios"); err = PTR_ERR_OR_ZERO(pdata->slot[slot_id].wp_pin); if (err) { - if (err != -ENOENT) + if (err != -ENOENT) { + of_node_put(cnp); return ERR_PTR(err); + } pdata->slot[slot_id].wp_pin = NULL; } }
for_each_child_of_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. This was done using the Coccinelle semantic patch iterators/for_each_child.cocci Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr> --- drivers/mmc/host/atmel-mci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)