diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-10-22 05:02:50 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-10-22 10:26:28 -0400 |
commit | 855ff2878ec5ef15f0a69a528b2ca676edfb3ee4 (patch) | |
tree | 5a0be890d65d0e5aabbaaa289f5a1e8fbcfec5ca | |
parent | e300745a4c60f424eaf7c7b7cc6bab3e56380c89 (diff) |
of/unittest: 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>
Combine the puts into code at the end of the function, for conciseness.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | drivers/of/unittest.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 9f71770b6226..e16ea5717b7f 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c | |||
@@ -205,16 +205,20 @@ static int __init of_unittest_check_node_linkage(struct device_node *np) | |||
205 | if (child->parent != np) { | 205 | if (child->parent != np) { |
206 | pr_err("Child node %s links to wrong parent %s\n", | 206 | pr_err("Child node %s links to wrong parent %s\n", |
207 | child->name, np->name); | 207 | child->name, np->name); |
208 | return -EINVAL; | 208 | rc = -EINVAL; |
209 | goto put_child; | ||
209 | } | 210 | } |
210 | 211 | ||
211 | rc = of_unittest_check_node_linkage(child); | 212 | rc = of_unittest_check_node_linkage(child); |
212 | if (rc < 0) | 213 | if (rc < 0) |
213 | return rc; | 214 | goto put_child; |
214 | count += rc; | 215 | count += rc; |
215 | } | 216 | } |
216 | 217 | ||
217 | return count + 1; | 218 | return count + 1; |
219 | put_child: | ||
220 | of_node_put(child); | ||
221 | return rc; | ||
218 | } | 222 | } |
219 | 223 | ||
220 | static void __init of_unittest_check_tree_linkage(void) | 224 | static void __init of_unittest_check_tree_linkage(void) |