]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
phy: qualcomm: phy-qcom-qmp: Add of_node_put() before return
authorNishka Dasgupta <nishkadg.linux@gmail.com>
Thu, 8 Aug 2019 07:29:37 +0000 (12:59 +0530)
committerKishon Vijay Abraham I <kishon@ti.com>
Mon, 26 Aug 2019 11:50:02 +0000 (17:20 +0530)
Each iteration of for_each_available_child_of_node() puts the previous
node, but in the case of a return from the middle of the loop, there is
no put, thus causing a memory leak. Hence create a new label,
err_node_put, that puts the previous node (child) before returning the
required value. Also include the statement pm_runtime_disable() under
this label in order to avoid repetition among mid-loop return
conditions. Edit the mid-loop return statements to instead go to this
new label err_node_put.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/qualcomm/phy-qcom-qmp.c

index 34ff6434da8f897293dbe2edc8ff6af5e8ea51f9..e7b8283acce84796a0bb2889c65b4e826e3216fd 100644 (file)
@@ -2093,8 +2093,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
                if (ret) {
                        dev_err(dev, "failed to create lane%d phy, %d\n",
                                id, ret);
-                       pm_runtime_disable(dev);
-                       return ret;
+                       goto err_node_put;
                }
 
                /*
@@ -2105,8 +2104,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
                if (ret) {
                        dev_err(qmp->dev,
                                "failed to register pipe clock source\n");
-                       pm_runtime_disable(dev);
-                       return ret;
+                       goto err_node_put;
                }
                id++;
        }
@@ -2118,6 +2116,11 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
                pm_runtime_disable(dev);
 
        return PTR_ERR_OR_ZERO(phy_provider);
+
+err_node_put:
+       pm_runtime_disable(dev);
+       of_node_put(child);
+       return ret;
 }
 
 static struct platform_driver qcom_qmp_phy_driver = {