pinctrl-tegra: add missing of_node_put
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 21 Dec 2015 16:39:44 +0000 (17:39 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 22 Dec 2015 12:44:00 +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/pinctrl-tegra-xusb.c
drivers/pinctrl/pinctrl-tegra.c

index 84a43e61295267aa5dfe07fc155095ac5ef390d3..bd3aa5a4fd6d296da5a592b781c4152844800eca 100644 (file)
@@ -253,8 +253,10 @@ static int tegra_xusb_padctl_dt_node_to_map(struct pinctrl_dev *pinctrl,
                err = tegra_xusb_padctl_parse_subnode(padctl, np, maps,
                                                      &reserved_maps,
                                                      num_maps);
-               if (err < 0)
+               if (err < 0) {
+                       of_node_put(np);
                        return err;
+               }
        }
 
        return 0;
index 0fd7fd2b0f72c23bd606ab0109e25c166dcdf0ee..9da4da219a0778af3f3ab6ec8b4336554fa15b66 100644 (file)
@@ -217,6 +217,7 @@ static int tegra_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
                if (ret < 0) {
                        pinctrl_utils_dt_free_map(pctldev, *map,
                                *num_maps);
+                       of_node_put(np);
                        return ret;
                }
        }