aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPantelis Antoniou <pantelis.antoniou@konsulko.com>2014-12-16 19:45:25 +0200
committerGrant Likely <grant.likely@linaro.org>2015-01-22 15:36:48 +0000
commit3e7f7626fd49a9ffba8520a1a073f62929acad63 (patch)
treef0dbfa1c11170dc42a9d1e52a180921af9e0cc93
parent957c8111478369780b241b19947ed52ba89acf80 (diff)
downloadlinux-3e7f7626fd49a9ffba8520a1a073f62929acad63.tar.gz
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>
-rw-r--r--drivers/of/overlay.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index ea63fbd228e..352b4f28f82 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -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;