diff options
| author | Timur Tabi <timur@codeaurora.org> | 2017-01-11 16:45:51 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-12 15:13:18 -0500 |
| commit | 994c5483e7f6dbf9fea622ba2031b9d868feb4b9 (patch) | |
| tree | 4fd095c82f487d1939d8201945e4334e4bdc3796 /drivers/net/ethernet/qualcomm/emac/emac.c | |
| parent | ea7a80858f57d8878b1499ea0f1b8a635cc48de7 (diff) | |
| download | blackbird-obmc-linux-994c5483e7f6dbf9fea622ba2031b9d868feb4b9.tar.gz blackbird-obmc-linux-994c5483e7f6dbf9fea622ba2031b9d868feb4b9.zip | |
net: qcom/emac: grab a reference to the phydev on ACPI systems
Commit 6ffe1c4cd0a7 ("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: Timur Tabi <timur@codeaurora.org>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/emac/emac.c')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/emac/emac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c index 422289c232bc..f46d300bd585 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac.c @@ -719,8 +719,7 @@ 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); + put_device(&adpt->phydev->mdio.dev); mdiobus_unregister(adpt->mii_bus); err_undo_clocks: emac_clks_teardown(adpt); @@ -740,8 +739,7 @@ static int emac_remove(struct platform_device *pdev) emac_clks_teardown(adpt); - if (!has_acpi_companion(&pdev->dev)) - put_device(&adpt->phydev->mdio.dev); + put_device(&adpt->phydev->mdio.dev); mdiobus_unregister(adpt->mii_bus); free_netdev(netdev); |
