public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>, <kishon@ti.com>
Subject: [PATCH 3/9] phy: mt65xx-usb3: add missing of_node_put
Date: Tue, 15 Dec 2015 15:34:18 +0530	[thread overview]
Message-ID: <1450173864-12708-4-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1450173864-12708-1-git-send-email-kishon@ti.com>

From: Julia Lawall <Julia.Lawall@lip6.fr>

for_each_child_of_node performs an of_node_get on each iteration,
so a return from the middle of the loop requires an of_node_put.

A simplified version of the semantic patch that finds 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;
|
*  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-mt65xx-usb3.c |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/phy/phy-mt65xx-usb3.c b/drivers/phy/phy-mt65xx-usb3.c
index f30b28b..e427c3b 100644
--- a/drivers/phy/phy-mt65xx-usb3.c
+++ b/drivers/phy/phy-mt65xx-usb3.c
@@ -415,7 +415,7 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
 	struct resource *sif_res;
 	struct mt65xx_u3phy *u3phy;
 	struct resource res;
-	int port;
+	int port, retval;
 
 	u3phy = devm_kzalloc(dev, sizeof(*u3phy), GFP_KERNEL);
 	if (!u3phy)
@@ -447,31 +447,34 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
 	for_each_child_of_node(np, child_np) {
 		struct mt65xx_phy_instance *instance;
 		struct phy *phy;
-		int retval;
 
 		instance = devm_kzalloc(dev, sizeof(*instance), GFP_KERNEL);
-		if (!instance)
-			return -ENOMEM;
+		if (!instance) {
+			retval = -ENOMEM;
+			goto put_child;
+		}
 
 		u3phy->phys[port] = instance;
 
 		phy = devm_phy_create(dev, child_np, &mt65xx_u3phy_ops);
 		if (IS_ERR(phy)) {
 			dev_err(dev, "failed to create phy\n");
-			return PTR_ERR(phy);
+			retval = PTR_ERR(phy);
+			goto put_child;
 		}
 
 		retval = of_address_to_resource(child_np, 0, &res);
 		if (retval) {
 			dev_err(dev, "failed to get address resource(id-%d)\n",
 				port);
-			return retval;
+			goto put_child;
 		}
 
 		instance->port_base = devm_ioremap_resource(&phy->dev, &res);
 		if (IS_ERR(instance->port_base)) {
 			dev_err(dev, "failed to remap phy regs\n");
-			return PTR_ERR(instance->port_base);
+			retval = PTR_ERR(instance->port_base);
+			goto put_child;
 		}
 
 		instance->phy = phy;
@@ -483,6 +486,9 @@ static int mt65xx_u3phy_probe(struct platform_device *pdev)
 	provider = devm_of_phy_provider_register(dev, mt65xx_phy_xlate);
 
 	return PTR_ERR_OR_ZERO(provider);
+put_child:
+	of_node_put(child_np);
+	return retval;
 }
 
 static const struct of_device_id mt65xx_u3phy_id_table[] = {
-- 
1.7.9.5


  parent reply	other threads:[~2015-12-15 10:04 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-15 10:04 [RESEND GIT PULL 0/9] phy: for 4.4 -rc Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 1/9] phy: sun9i-usb: add USB dependency Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 2/9] phy: brcmstb-sata: add missing of_node_put Kishon Vijay Abraham I
2015-12-15 10:04 ` Kishon Vijay Abraham I [this message]
2015-12-15 10:04 ` [PATCH 4/9] phy: berlin-sata: " Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 5/9] phy: rockchip-usb: " Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 6/9] phy: miphy28lp: " Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 7/9] phy: miphy365x: " Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 8/9] phy: cygnus: pcie: " Kishon Vijay Abraham I
2015-12-15 10:04 ` [PATCH 9/9] phy: core: Get a refcount to phy in devm_of_phy_get_by_index() Kishon Vijay Abraham I
2015-12-18 17:27 ` [RESEND GIT PULL 0/9] phy: for 4.4 -rc Greg KH
2015-12-20  8:25   ` Kishon Vijay Abraham I
  -- strict thread matches above, loose matches on Subject: below --
2015-12-07 13:51 [GIT " Kishon Vijay Abraham I
2015-12-07 13:51 ` [PATCH 3/9] phy: mt65xx-usb3: add missing of_node_put Kishon Vijay Abraham I

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=1450173864-12708-4-git-send-email-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /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