pinctrl: sirf: add missing of_node_put
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 21 Dec 2015 16:39:45 +0000 (17:39 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 22 Dec 2015 12:44:56 +0000 (13:44 +0100)
for_each_child_of_node performs an of_node_get on each iteration, so a
return from 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 e,e1;
@@

 for_each_child_of_node(e1,n) {
   ...
(
   of_node_put(n);
|
   e = n
|
   return n;
|
+  of_node_put(n);
?  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sirf/pinctrl-sirf.c

index 2a8d697..edf40df 100644 (file)
@@ -85,12 +85,16 @@ static int sirfsoc_dt_node_to_map(struct pinctrl_dev *pctldev,
        /* calculate number of maps required */
        for_each_child_of_node(np_config, np) {
                ret = of_property_read_string(np, "sirf,function", &function);
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(np);
                        return ret;
+               }
 
                ret = of_property_count_strings(np, "sirf,pins");
-               if (ret < 0)
+               if (ret < 0) {
+                       of_node_put(np);
                        return ret;
+               }
 
                count += ret;
        }