| Message ID | 20160125172748.GA26252@amitoj-Inspiron-3542 |
|---|---|
| State | Accepted |
| Delegated to: | Thierry Reding |
| Headers | show |
On Mon, Jan 25, 2016 at 10:57:48PM +0530, Amitoj Kaur Chawla wrote: > for_each_child_of_node performs an of_node_get on each iteration, so > to break out of the loop an of_node_put is required. > > Found using Coccinelle. The semantic patch used for this is as follows: > > // <smpl> > @@ > expression e; > local idexpression n; > @@ > > for_each_child_of_node(..., n) { > ... when != of_node_put(n) > when != e = n > ( > return n; > | > + of_node_put(n); > ? return ...; > ) > ... > } > // </smpl > > Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> > --- > Changes in v2: > -Modified the note underneath --- > > There is an extra of_node_put() before a continue in the same file on > line 1001 which should be deleted too. Julia Lawall has already sent a patch > to delete this but if preferred I can send one patch to do both the changes. > > drivers/memory/tegra/tegra124-emc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied, thanks. Thierry
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c index 3dac7be..02a6317 100644 --- a/drivers/memory/tegra/tegra124-emc.c +++ b/drivers/memory/tegra/tegra124-emc.c @@ -970,8 +970,10 @@ static int tegra_emc_load_timings_from_dt(struct tegra_emc *emc, timing = &emc->timings[i++]; err = load_one_timing_from_dt(emc, timing, child); - if (err) + if (err) { + of_node_put(child); return err; + } } sort(emc->timings, emc->num_timings, sizeof(*timing), cmp_timings,
for_each_child_of_node performs an of_node_get on each iteration, so to break out of the loop an of_node_put is required. Found using Coccinelle. The semantic patch used for this is as follows: // <smpl> @@ expression e; local idexpression n; @@ for_each_child_of_node(..., n) { ... when != of_node_put(n) when != e = n ( return n; | + of_node_put(n); ? return ...; ) ... } // </smpl Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> --- Changes in v2: -Modified the note underneath --- There is an extra of_node_put() before a continue in the same file on line 1001 which should be deleted too. Julia Lawall has already sent a patch to delete this but if preferred I can send one patch to do both the changes. drivers/memory/tegra/tegra124-emc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)