From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: kernel-janitors@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Andrew Lunn <andrew@lunn.ch>, Bjorn Helgaas <bhelgaas@google.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH 8/8] net: mv643xx_eth: add missing of_node_put
Date: Sun, 25 Oct 2015 14:57:07 +0100 [thread overview]
Message-ID: <1445781427-7110-9-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1445781427-7110-1-git-send-email-Julia.Lawall@lip6.fr>
for_each_available_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_available_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/net/ethernet/marvell/mv643xx_eth.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 603d29d..18ea385 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2785,8 +2785,10 @@ static int mv643xx_eth_shared_of_probe(struct platform_device *pdev)
for_each_available_child_of_node(np, pnp) {
ret = mv643xx_eth_shared_of_add_port(pdev, pnp);
- if (ret)
+ if (ret) {
+ of_node_put(pnp);
return ret;
+ }
}
return 0;
}
next prev parent reply other threads:[~2015-10-25 14:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-25 13:56 [PATCH 0/8] add missing of_node_put Julia Lawall
2015-10-25 13:57 ` [PATCH 1/8] net: thunderx: " Julia Lawall
2015-10-25 13:57 ` [PATCH 2/8] net: netcp: " Julia Lawall
2015-10-25 13:57 ` [PATCH 3/8] netdev/phy: " Julia Lawall
2015-10-25 13:57 ` [PATCH 4/8] net: phy: mdio: " Julia Lawall
2015-10-25 13:57 ` [PATCH 5/8] [media] v4l: xilinx-vipp: " Julia Lawall
2015-10-26 1:20 ` Laurent Pinchart
2015-10-25 13:57 ` [PATCH 6/8] [media] v4l: xilinx-tpg: " Julia Lawall
2015-10-26 1:19 ` Laurent Pinchart
2015-10-25 13:57 ` [PATCH 7/8] ath6kl: " Julia Lawall
2015-10-25 13:57 ` Julia Lawall [this message]
2015-10-27 5:08 ` [PATCH 0/8] " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445781427-7110-9-git-send-email-Julia.Lawall@lip6.fr \
--to=julia.lawall@lip6.fr \
--cc=andrew@lunn.ch \
--cc=bhelgaas@google.com \
--cc=jason@lakedaemon.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).