Commit 855ff287 authored by Julia Lawall's avatar Julia Lawall Committed by Rob Herring

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent e300745a
...@@ -205,16 +205,20 @@ static int __init of_unittest_check_node_linkage(struct device_node *np) ...@@ -205,16 +205,20 @@ static int __init of_unittest_check_node_linkage(struct device_node *np)
if (child->parent != np) { if (child->parent != np) {
pr_err("Child node %s links to wrong parent %s\n", pr_err("Child node %s links to wrong parent %s\n",
child->name, np->name); child->name, np->name);
return -EINVAL; rc = -EINVAL;
goto put_child;
} }
rc = of_unittest_check_node_linkage(child); rc = of_unittest_check_node_linkage(child);
if (rc < 0) if (rc < 0)
return rc; goto put_child;
count += rc; count += rc;
} }
return count + 1; return count + 1;
put_child:
of_node_put(child);
return rc;
} }
static void __init of_unittest_check_tree_linkage(void) static void __init of_unittest_check_tree_linkage(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment