Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ffe1c4c authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller
Browse files

net: qcom/emac: fix of_node and phydev leaks 



Make sure to drop the reference taken by of_phy_find_device() during
probe on probe errors and on driver unbind.

Also drop the of_node reference taken by of_parse_phandle() in the same
path.

Fixes: b9b17deb ("net: emac: emac gigabit ethernet controller driver")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb1f3410

drivers/net/ethernet/qualcomm/emac/emac-phy.c

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ int emac_phy_config(struct platform_device *pdev, struct emac_adapter *adpt) 


		phy_np = of_parse_phandle(np, "phy-handle", 0);

		adpt->phydev = of_phy_find_device(phy_np);

		of_node_put(phy_np);

	}



	if (!adpt->phydev) {

drivers/net/ethernet/qualcomm/emac/emac.c

+4 −0
Original line number Diff line number Diff line
@@ -711,6 +711,8 @@ static int emac_probe(struct platform_device *pdev) 
err_undo_napi:

	netif_napi_del(&adpt->rx_q.napi);

err_undo_mdiobus:

	if (!has_acpi_companion(&pdev->dev))

		put_device(&adpt->phydev->mdio.dev);

	mdiobus_unregister(adpt->mii_bus);

err_undo_clocks:

	emac_clks_teardown(adpt);
@@ -730,6 +732,8 @@ static int emac_remove(struct platform_device *pdev) 


	emac_clks_teardown(adpt);



	if (!has_acpi_companion(&pdev->dev))

		put_device(&adpt->phydev->mdio.dev);

	mdiobus_unregister(adpt->mii_bus);

	free_netdev(netdev);