Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1270046
| From | Julia Lawall <Julia.Lawall@lip6.fr> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 7/7] phy: cygnus: pcie: add missing of_node_put |
| Date | 2015-11-16 12:50 +0100 |
| Message-ID | <qvqsj-6MZ-45@gated-at.bofh.it> (permalink) |
| References | <qvqsh-6MZ-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
---
drivers/phy/phy-bcm-cygnus-pcie.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/phy/phy-bcm-cygnus-pcie.c b/drivers/phy/phy-bcm-cygnus-pcie.c
index 7ad72b7..082c03f 100644
--- a/drivers/phy/phy-bcm-cygnus-pcie.c
+++ b/drivers/phy/phy-bcm-cygnus-pcie.c
@@ -128,6 +128,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
struct phy_provider *provider;
struct resource *res;
unsigned cnt = 0;
+ int ret;
if (of_get_child_count(node) == 0) {
dev_err(dev, "PHY no child node\n");
@@ -154,24 +155,28 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
if (of_property_read_u32(child, "reg", &id)) {
dev_err(dev, "missing reg property for %s\n",
child->name);
- return -EINVAL;
+ ret = -EINVAL;
+ goto put_child;
}
if (id >= MAX_NUM_PHYS) {
dev_err(dev, "invalid PHY id: %u\n", id);
- return -EINVAL;
+ ret = -EINVAL;
+ goto put_child;
}
if (core->phys[id].phy) {
dev_err(dev, "duplicated PHY id: %u\n", id);
- return -EINVAL;
+ ret = -EINVAL;
+ goto put_child;
}
p = &core->phys[id];
p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
if (IS_ERR(p->phy)) {
dev_err(dev, "failed to create PHY\n");
- return PTR_ERR(p->phy);
+ ret = PTR_ERR(p->phy);
+ goto put_child;
}
p->core = core;
@@ -191,6 +196,9 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);
return 0;
+put_child:
+ of_node_put(child);
+ return ret;
}
static const struct of_device_id cygnus_pcie_phy_match_table[] = {
--
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
[PATCH 0/7] add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
[PATCH 3/7] phy: berlin-sata: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
Re: [PATCH 3/7] phy: berlin-sata: add missing of_node_put Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - 2015-11-19 21:50 +0100
[PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 02:40 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 07:20 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 18:50 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 19:40 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 19:40 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Julia Lawall <julia.lawall@lip6.fr> - 2015-11-17 23:40 +0100
device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put) Brian Norris <computersforpeace@gmail.com> - 2015-11-18 20:10 +0100
Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put) Julia Lawall <julia.lawall@lip6.fr> - 2015-11-18 21:50 +0100
Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put) Rob Herring <robh@kernel.org> - 2015-11-19 19:50 +0100
Re: device_node lifetime (was: Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put) Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-11-19 20:20 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Brian Norris <computersforpeace@gmail.com> - 2015-11-17 18:50 +0100
Re: [PATCH 1/7] phy: brcmstb-sata: add missing of_node_put Kishon Vijay Abraham I <kishon@ti.com> - 2015-11-27 15:20 +0100
[PATCH 7/7] phy: cygnus: pcie: add missing of_node_put Julia Lawall <Julia.Lawall@lip6.fr> - 2015-11-16 12:50 +0100
Re: [PATCH 7/7] phy: cygnus: pcie: add missing of_node_put Ray Jui <rjui@broadcom.com> - 2015-11-16 18:20 +0100
csiph-web