Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e7f7626 authored by Pantelis Antoniou's avatar Pantelis Antoniou Committed by Grant Likely
Browse files

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: default avatarPantelis Antoniou <pantelis.antoniou@konsulko.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent 957c8111

drivers/of/overlay.c

+0 −11
Original line number Diff line number Diff line
@@ -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;