diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-10-22 12:02:48 +0300 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-10-22 17:35:51 +0300 |
commit | 001cf5048e99df7ddac2716ee9958083488b6071 (patch) | |
tree | 4184f1ddbf6f870edf8a5cfa0ec7f0f989f2b974 | |
parent | 7fad948a7c22cf47ef4e3c3127cd961ff5e2d394 (diff) | |
download | linux-001cf5048e99df7ddac2716ee9958083488b6071.tar.xz |
of/overlay: add missing of_node_put
for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.
A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
@@
for_each_child_of_node(root, child) {
... when != of_node_put(child)
when != e = child
(
return child;
|
+ of_node_put(child);
? return ...;
)
...
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | drivers/of/overlay.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 24e025f79299..54e5af9d7377 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -149,6 +149,7 @@ static int of_overlay_apply_one(struct of_overlay *ov, pr_err("%s: Failed to apply single node @%s/%s\n", __func__, target->full_name, child->name); + of_node_put(child); return ret; } } @@ -417,8 +418,10 @@ static int overlay_subtree_check(struct device_node *tree, return 1; for_each_child_of_node(tree, child) { - if (overlay_subtree_check(child, dn)) + if (overlay_subtree_check(child, dn)) { + of_node_put(child); return 1; + } } return 0; |