diff options
| author | Pantelis Antoniou <pantelis.antoniou@konsulko.com> | 2014-12-16 19:45:25 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-17 11:56:14 +0900 |
| commit | 5e3b95753e328dc2468e2865cbe6ec93a87594ca (patch) | |
| tree | 35501ab10d2ccf5cd0f2c13d08fc27bc7ff9a295 | |
| parent | 0327df42b40c24073ecd7fb2b81e1511f2f1412d (diff) | |
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>
(cherry picked from commit 3e7f7626fd49a9ffba8520a1a073f62929acad63)
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/of/overlay.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index ea63fbd228ed..352b4f28f82c 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; |