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>

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>
Pantelis Antoniou · Grant Likely · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent 957c811147
Showing 1 changed file with 0 additions and 11 deletions Side-by-side Diff
drivers/of/overlay.c
@@ -114,17 +114,6 @@
 		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;
...	...	@@ -114,17 +114,6 @@
114	114	ret = of_overlay_apply_one(ov, tchild, child);
115	115	if (ret)
116	116	return ret;
117		-
118		- /* The properties are already copied, now do the child nodes */
119		- for_each_child_of_node(child, grandchild) {
120		- ret = of_overlay_apply_single_device_node(ov, tchild, grandchild);
121		- if (ret) {
122		- pr_err("%s: Failed to apply single node @%s/%s\n",
123		- __func__, tchild->full_name,
124		- grandchild->name);
125		- return ret;
126		- }
127		- }
128	117	}
129	118
130	119	return ret;