diff options
| author |   Johan Hovold <johan@kernel.org> | 2016-11-28 19:24:56 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-29 23:17:02 -0500 |
| commit | 5a89394ad2a5b94885bdbbb611518b0cc70bf354 (patch) | |
| tree | bc37616a2b15a4bf4c0f33092b28c5761a4c024e /drivers/net/ethernet/altera | |
| parent | of_mdio: add helper to deregister fixed-link PHYs (diff) | |
| download | linux-dev-5a89394ad2a5b94885bdbbb611518b0cc70bf354.tar.xz linux-dev-5a89394ad2a5b94885bdbbb611518b0cc70bf354.zip | |
net: ethernet: altera: fix fixed-link phydev leaks
Make sure to deregister and free any fixed-link PHY registered using
of_phy_register_fixed_link() on probe errors and on driver unbind.
Fixes: 7cdbc6f74f8e ("altera tse: add support for fixed-links.")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/altera')
| -rw-r--r-- | drivers/net/ethernet/altera/altera_tse_main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index bda31f308cc2..6532829b70d2 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -819,6 +819,8 @@ static int init_phy(struct net_device *dev) if (!phydev) { netdev_err(dev, "Could not find the PHY\n"); + if (fixed_link) + of_phy_deregister_fixed_link(priv->device->of_node); return -ENODEV; } @@ -1545,10 +1547,15 @@ err_free_netdev: static int altera_tse_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); + struct altera_tse_private *priv = netdev_priv(ndev); - if (ndev->phydev) + if (ndev->phydev) { phy_disconnect(ndev->phydev); + if (of_phy_is_fixed_link(priv->device->of_node)) + of_phy_deregister_fixed_link(priv->device->of_node); + } + platform_set_drvdata(pdev, NULL); altera_tse_mdio_destroy(ndev); unregister_netdev(ndev); |