| Message ID | 1359116387-32613-1-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/25/2013 06:19 AM, Ezequiel Garcia wrote: > for_each_node_by_name() automatically calls of_node_put() on each > node passed; so don't do it explicitly unless there's an error. > > Reported-by: Mark Rutland <mark.rutland@arm.com> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > --- > arch/arm/mach-omap2/gpmc.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 01ce462..c6255f7 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -1271,9 +1271,10 @@ static int gpmc_probe_dt(struct platform_device *pdev) > > for_each_node_by_name(child, "nand") { > ret = gpmc_probe_nand_child(pdev, child); > - of_node_put(child); > - if (ret < 0) > + if (ret < 0) { > + of_node_put(child); > return ret; > + } > } > > return 0; > Acked-by: Jon Hunter <jon-hunter@ti.com> Thanks! Jon
* Jon Hunter <jon-hunter@ti.com> [130125 06:21]: > > On 01/25/2013 06:19 AM, Ezequiel Garcia wrote: > > for_each_node_by_name() automatically calls of_node_put() on each > > node passed; so don't do it explicitly unless there's an error. > > > > Reported-by: Mark Rutland <mark.rutland@arm.com> > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > --- > > arch/arm/mach-omap2/gpmc.c | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > > index 01ce462..c6255f7 100644 > > --- a/arch/arm/mach-omap2/gpmc.c > > +++ b/arch/arm/mach-omap2/gpmc.c > > @@ -1271,9 +1271,10 @@ static int gpmc_probe_dt(struct platform_device *pdev) > > > > for_each_node_by_name(child, "nand") { > > ret = gpmc_probe_nand_child(pdev, child); > > - of_node_put(child); > > - if (ret < 0) > > + if (ret < 0) { > > + of_node_put(child); > > return ret; > > + } > > } > > > > return 0; > > > > Acked-by: Jon Hunter <jon-hunter@ti.com> Thanks applying into omap-for-v3.9/gpmc. Tony
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 01ce462..c6255f7 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1271,9 +1271,10 @@ static int gpmc_probe_dt(struct platform_device *pdev) for_each_node_by_name(child, "nand") { ret = gpmc_probe_nand_child(pdev, child); - of_node_put(child); - if (ret < 0) + if (ret < 0) { + of_node_put(child); return ret; + } } return 0;
for_each_node_by_name() automatically calls of_node_put() on each node passed; so don't do it explicitly unless there's an error. Reported-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/mach-omap2/gpmc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)