Skip to content

Commit

Permalink
of/overlay: Do not generate duplicate nodes
Browse files Browse the repository at this point in the history
During the course of the rewrites a bug sneaked in when dealing
with children nodes of overlays, which ends up duplicating
sub nodes.

Simply remove the duplicate traversal of child nodes to fix.

Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
  • Loading branch information
pantoniou authored and glikely committed Jan 22, 2015
1 parent 957c811 commit 3e7f762
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions drivers/of/overlay.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,6 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov,
ret = of_overlay_apply_one(ov, tchild, child);
if (ret)
return ret;

/* The properties are already copied, now do the child nodes */
for_each_child_of_node(child, grandchild) {
ret = of_overlay_apply_single_device_node(ov, tchild, grandchild);
if (ret) {
pr_err("%s: Failed to apply single node @%s/%s\n",
__func__, tchild->full_name,
grandchild->name);
return ret;
}
}
}

return ret;
Expand Down

0 comments on commit 3e7f762

Please sign in to comment.