Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1296078

[PATCH 2/5] pinctrl: sirf: add missing of_node_put

Show all headers | View raw

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>

---
 drivers/pinctrl/sirf/pinctrl-sirf.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/sirf/pinctrl-sirf.c b/drivers/pinctrl/sirf/pinctrl-sirf.c
index ae97bdc..18fe46d 100644
--- a/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/drivers/pinctrl/sirf/pinctrl-sirf.c
@@ -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;
 	}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-21 18:00 +0100
  [PATCH 2/5] pinctrl: sirf: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-21 18:00 +0100
    Re: [PATCH 2/5] pinctrl: sirf: add missing of_node_put Linus Walleij <linus.walleij@linaro.org> - 2015-12-22 13:50 +0100
  [PATCH 1/5] pinctrl-tegra: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-21 18:00 +0100
    Re: [PATCH 1/5] pinctrl-tegra: add missing of_node_put Linus Walleij <linus.walleij@linaro.org> - 2015-12-22 13:50 +0100
  [PATCH 5/5] pinctrl: mediatek: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-21 18:00 +0100

csiph-web