Commit 39c2b964 authored by Julia Lawall's avatar Julia Lawall Committed by Kishon Vijay Abraham I

phy: miphy365x: add missing of_node_put

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 7fd7fa43
...@@ -566,22 +566,25 @@ static int miphy365x_probe(struct platform_device *pdev) ...@@ -566,22 +566,25 @@ static int miphy365x_probe(struct platform_device *pdev)
miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy), miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
GFP_KERNEL); GFP_KERNEL);
if (!miphy_phy) if (!miphy_phy) {
return -ENOMEM; ret = -ENOMEM;
goto put_child;
}
miphy_dev->phys[port] = miphy_phy; miphy_dev->phys[port] = miphy_phy;
phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops); phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
dev_err(&pdev->dev, "failed to create PHY\n"); dev_err(&pdev->dev, "failed to create PHY\n");
return PTR_ERR(phy); ret = PTR_ERR(phy);
goto put_child;
} }
miphy_dev->phys[port]->phy = phy; miphy_dev->phys[port]->phy = phy;
ret = miphy365x_of_probe(child, miphy_phy); ret = miphy365x_of_probe(child, miphy_phy);
if (ret) if (ret)
return ret; goto put_child;
phy_set_drvdata(phy, miphy_dev->phys[port]); phy_set_drvdata(phy, miphy_dev->phys[port]);
...@@ -591,12 +594,15 @@ static int miphy365x_probe(struct platform_device *pdev) ...@@ -591,12 +594,15 @@ static int miphy365x_probe(struct platform_device *pdev)
&miphy_phy->ctrlreg); &miphy_phy->ctrlreg);
if (ret) { if (ret) {
dev_err(&pdev->dev, "No sysconfig offset found\n"); dev_err(&pdev->dev, "No sysconfig offset found\n");
return ret; goto put_child;
} }
} }
provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate); provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
return PTR_ERR_OR_ZERO(provider); return PTR_ERR_OR_ZERO(provider);
put_child:
of_node_put(child);
return ret;
} }
static const struct of_device_id miphy365x_of_match[] = { static const struct of_device_id miphy365x_of_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment