| Message ID | 20250305163753.34913-2-fabrizio.castro.jz@renesas.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 391b41f983bf7ff853de44704d8e14e7cc648a9b |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Fix missing of_node_put() calls | expand |
On Wed, Mar 5, 2025 at 4:39 PM Fabrizio Castro <fabrizio.castro.jz@renesas.com> wrote: > > of_parse_phandle_with_fixed_args() requires its caller to > call into of_node_put() on the node pointer from the output > structure, but such a call is currently missing. > > Call into of_node_put() to rectify that. > > Fixes: 159f8a0209af ("gpio-rcar: Add DT support") > Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > --- > drivers/gpio/gpio-rcar.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Cheers, Prabhakar > diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c > index 2ecee3269a0c..7208739cd2d4 100644 > --- a/drivers/gpio/gpio-rcar.c > +++ b/drivers/gpio/gpio-rcar.c > @@ -468,7 +468,12 @@ static int gpio_rcar_parse_dt(struct gpio_rcar_priv *p, unsigned int *npins) > p->info = *info; > > ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &args); > - *npins = ret == 0 ? args.args[2] : RCAR_MAX_GPIO_PER_BANK; > + if (ret) { > + *npins = RCAR_MAX_GPIO_PER_BANK; > + } else { > + *npins = args.args[2]; > + of_node_put(args.np); > + } > > if (*npins == 0 || *npins > RCAR_MAX_GPIO_PER_BANK) { > dev_warn(p->dev, "Invalid number of gpio lines %u, using %u\n", > -- > 2.34.1 > >
On Wed, 5 Mar 2025 at 17:38, Fabrizio Castro <fabrizio.castro.jz@renesas.com> wrote: > of_parse_phandle_with_fixed_args() requires its caller to > call into of_node_put() on the node pointer from the output > structure, but such a call is currently missing. > > Call into of_node_put() to rectify that. > > Fixes: 159f8a0209af ("gpio-rcar: Add DT support") > Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index 2ecee3269a0c..7208739cd2d4 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -468,7 +468,12 @@ static int gpio_rcar_parse_dt(struct gpio_rcar_priv *p, unsigned int *npins) p->info = *info; ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &args); - *npins = ret == 0 ? args.args[2] : RCAR_MAX_GPIO_PER_BANK; + if (ret) { + *npins = RCAR_MAX_GPIO_PER_BANK; + } else { + *npins = args.args[2]; + of_node_put(args.np); + } if (*npins == 0 || *npins > RCAR_MAX_GPIO_PER_BANK) { dev_warn(p->dev, "Invalid number of gpio lines %u, using %u\n",
of_parse_phandle_with_fixed_args() requires its caller to call into of_node_put() on the node pointer from the output structure, but such a call is currently missing. Call into of_node_put() to rectify that. Fixes: 159f8a0209af ("gpio-rcar: Add DT support") Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> --- drivers/gpio/gpio-rcar.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)