Commit 7fad948a authored by Julia Lawall's avatar Julia Lawall Committed by Rob Herring

of/platform: 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>
@@
local idexpression n;
expression root,e;
@@

 for_each_child_of_node(root,n) {
   ...
(
   of_node_put(n);
|
   e = n
|
+  of_node_put(n);
?  break;
)
   ...
 }
... when != n
// </smpl>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 8363ccb9
...@@ -405,8 +405,10 @@ int of_platform_bus_probe(struct device_node *root, ...@@ -405,8 +405,10 @@ int of_platform_bus_probe(struct device_node *root,
if (!of_match_node(matches, child)) if (!of_match_node(matches, child))
continue; continue;
rc = of_platform_bus_create(child, matches, NULL, parent, false); rc = of_platform_bus_create(child, matches, NULL, parent, false);
if (rc) if (rc) {
of_node_put(child);
break; break;
}
} }
of_node_put(root); of_node_put(root);
...@@ -447,8 +449,10 @@ int of_platform_populate(struct device_node *root, ...@@ -447,8 +449,10 @@ int of_platform_populate(struct device_node *root,
for_each_child_of_node(root, child) { for_each_child_of_node(root, child) {
rc = of_platform_bus_create(child, matches, lookup, parent, true); rc = of_platform_bus_create(child, matches, lookup, parent, true);
if (rc) if (rc) {
of_node_put(child);
break; break;
}
} }
of_node_set_flag(root, OF_POPULATED_BUS); of_node_set_flag(root, OF_POPULATED_BUS);
......
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