leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

of/overlay: Do not generate duplicate nodes

Browse Source 
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>
This commit is contained in:
Pantelis Antoniou 2014-12-16 19:45:25 +02:00 committed by Grant Likely
parent 957c811147
commit 3e7f7626fd
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/of/overlay.c
View File

@ -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;