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 2/9] phy: brcmstb-sata: add missing of_node_put
Date: Tue, 15 Dec 2015 15:34:17 +0530	[thread overview]
Message-ID: <1450173864-12708-3-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_available_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_available_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>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/phy/phy-brcmstb-sata.c |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/phy/phy-brcmstb-sata.c b/drivers/phy/phy-brcmstb-sata.c
index 8a2cb16..cd9dba8 100644
--- a/drivers/phy/phy-brcmstb-sata.c
+++ b/drivers/phy/phy-brcmstb-sata.c
@@ -140,7 +140,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 	struct brcm_sata_phy *priv;
 	struct resource *res;
 	struct phy_provider *provider;
-	int count = 0;
+	int ret, count = 0;
 
 	if (of_get_child_count(dn) == 0)
 		return -ENODEV;
@@ -163,16 +163,19 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 		if (of_property_read_u32(child, "reg", &id)) {
 			dev_err(dev, "missing reg property in node %s\n",
 					child->name);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 
 		if (id >= MAX_PORTS) {
 			dev_err(dev, "invalid reg: %u\n", id);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 		if (priv->phys[id].phy) {
 			dev_err(dev, "already registered port %u\n", id);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto put_child;
 		}
 
 		port = &priv->phys[id];
@@ -182,7 +185,8 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 		port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
 		if (IS_ERR(port->phy)) {
 			dev_err(dev, "failed to create PHY\n");
-			return PTR_ERR(port->phy);
+			ret = PTR_ERR(port->phy);
+			goto put_child;
 		}
 
 		phy_set_drvdata(port->phy, port);
@@ -198,6 +202,9 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
 	dev_info(dev, "registered %d port(s)\n", count);
 
 	return 0;
+put_child:
+	of_node_put(child);
+	return ret;
 }
 
 static struct platform_driver brcm_sata_phy_driver = {
-- 
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 ` Kishon Vijay Abraham I [this message]
2015-12-15 10:04 ` [PATCH 3/9] phy: mt65xx-usb3: add missing of_node_put Kishon Vijay Abraham I
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 2/9] phy: brcmstb-sata: 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-3-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