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

Groups > linux.kernel > #1255409

[PATCH 5/8] [media] v4l: xilinx-vipp: 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 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>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/media/platform/xilinx/xilinx-vipp.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c
index 7b7cb9c..b9bf24f 100644
--- a/drivers/media/platform/xilinx/xilinx-vipp.c
+++ b/drivers/media/platform/xilinx/xilinx-vipp.c
@@ -476,8 +476,10 @@ static int xvip_graph_dma_init(struct xvip_composite_device *xdev)
 
 	for_each_child_of_node(ports, port) {
 		ret = xvip_graph_dma_init_one(xdev, port);
-		if (ret < 0)
+		if (ret < 0) {
+			of_node_put(port);
 			return ret;
+		}
 	}
 
 	return 0;

--
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/8] add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-25 15:20 +0100
  [PATCH 5/8] [media] v4l: xilinx-vipp: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-25 15:20 +0100
    Re: [PATCH 5/8] [media] v4l: xilinx-vipp: add missing of_node_put Laurent Pinchart <laurent.pinchart@ideasonboard.com> - 2015-10-26 02:30 +0100
  [PATCH 2/8] net: netcp: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-25 15:20 +0100
  Re: [PATCH 0/8] add missing of_node_put David Miller <davem@davemloft.net> - 2015-10-27 06:00 +0100

csiph-web