of/overlay: Do not generate duplicate nodes
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:
parent
957c811147
commit
3e7f7626fd
|
@ -114,17 +114,6 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov,
|
||||||
ret = of_overlay_apply_one(ov, tchild, child);
|
ret = of_overlay_apply_one(ov, tchild, child);
|
||||||
if (ret)
|
if (ret)
|
||||||
return 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;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue