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

Commit 994c5483 authored by Timur Tabi's avatar Timur Tabi Committed by David S. Miller
Browse files

net: qcom/emac: grab a reference to the phydev on ACPI systems 



Commit 6ffe1c4c ("net: qcom/emac: fix of_node and phydev leaks")
fixed the problem with reference leaks on phydev, but the fix is
device-tree specific.  When the driver unloads, the reference is
dropped only on DT systems.

Instead, it's cleaner if up grab an reference on ACPI systems.
When the driver unloads, we can drop the reference without having
to check whether we're on a DT system.

Signed-off-by: default avatarTimur Tabi <timur@codeaurora.org>
Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea7a8085

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

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

			adpt->phydev = mdiobus_get_phy(mii_bus, phy_addr);



		/* of_phy_find_device() claims a reference to the phydev,

		 * so we do that here manually as well. When the driver

		 * later unloads, it can unilaterally drop the reference

		 * without worrying about ACPI vs DT.

		 */

		if (adpt->phydev)

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

	} else {

		struct device_node *phy_np;

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

+2 −4
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ 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:
@@ -740,7 +739,6 @@ 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);