Commit d2c50b1c authored by Wen Yang's avatar Wen Yang Committed by David S. Miller

net: mscc: ocelot: add missing of_node_put after calling of_get_child_by_name

of_node_put needs to be called when the device node which is got
from of_get_child_by_name finished using.
In both cases of success and failure, we need to release 'ports',
so clean up the code using goto.

fixes: a556c76a ("net: mscc: Add initial Ocelot switch support")
Signed-off-by: default avatarWen Yang <wenyang@linux.alibaba.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83c8c3cf
...@@ -388,13 +388,14 @@ static int mscc_ocelot_probe(struct platform_device *pdev) ...@@ -388,13 +388,14 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
continue; continue;
phy = of_phy_find_device(phy_node); phy = of_phy_find_device(phy_node);
of_node_put(phy_node);
if (!phy) if (!phy)
continue; continue;
err = ocelot_probe_port(ocelot, port, regs, phy); err = ocelot_probe_port(ocelot, port, regs, phy);
if (err) { if (err) {
of_node_put(portnp); of_node_put(portnp);
return err; goto out_put_ports;
} }
phy_mode = of_get_phy_mode(portnp); phy_mode = of_get_phy_mode(portnp);
...@@ -422,7 +423,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) ...@@ -422,7 +423,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
"invalid phy mode for port%d, (Q)SGMII only\n", "invalid phy mode for port%d, (Q)SGMII only\n",
port); port);
of_node_put(portnp); of_node_put(portnp);
return -EINVAL; err = -EINVAL;
goto out_put_ports;
} }
serdes = devm_of_phy_get(ocelot->dev, portnp, NULL); serdes = devm_of_phy_get(ocelot->dev, portnp, NULL);
...@@ -435,7 +437,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) ...@@ -435,7 +437,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
"missing SerDes phys for port%d\n", "missing SerDes phys for port%d\n",
port); port);
goto err_probe_ports; of_node_put(portnp);
goto out_put_ports;
} }
ocelot->ports[port]->serdes = serdes; ocelot->ports[port]->serdes = serdes;
...@@ -447,9 +450,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) ...@@ -447,9 +450,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "Ocelot switch probed\n"); dev_info(&pdev->dev, "Ocelot switch probed\n");
return 0; out_put_ports:
of_node_put(ports);
err_probe_ports:
return err; return err;
} }
......
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