Commit 14cab6f6 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller

net: ethernet: ti: davinci_emac: fix fixed-link phydev and of-node 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.

Also remember to put the of-node reference on probe errors.

Fixes: 1bb6aa56 ("net: davinci_emac: Add support for fixed-link
PHY")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c41a4767
...@@ -1767,6 +1767,7 @@ static int davinci_emac_try_get_mac(struct platform_device *pdev, ...@@ -1767,6 +1767,7 @@ static int davinci_emac_try_get_mac(struct platform_device *pdev,
*/ */
static int davinci_emac_probe(struct platform_device *pdev) static int davinci_emac_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node;
int rc = 0; int rc = 0;
struct resource *res, *res_ctrl; struct resource *res, *res_ctrl;
struct net_device *ndev; struct net_device *ndev;
...@@ -1805,7 +1806,7 @@ static int davinci_emac_probe(struct platform_device *pdev) ...@@ -1805,7 +1806,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "no platform data\n"); dev_err(&pdev->dev, "no platform data\n");
rc = -ENODEV; rc = -ENODEV;
goto no_pdata; goto err_free_netdev;
} }
/* MAC addr and PHY mask , RMII enable info from platform_data */ /* MAC addr and PHY mask , RMII enable info from platform_data */
...@@ -1941,6 +1942,10 @@ static int davinci_emac_probe(struct platform_device *pdev) ...@@ -1941,6 +1942,10 @@ static int davinci_emac_probe(struct platform_device *pdev)
cpdma_chan_destroy(priv->rxchan); cpdma_chan_destroy(priv->rxchan);
cpdma_ctlr_destroy(priv->dma); cpdma_ctlr_destroy(priv->dma);
no_pdata: no_pdata:
if (of_phy_is_fixed_link(np))
of_phy_deregister_fixed_link(np);
of_node_put(priv->phy_node);
err_free_netdev:
free_netdev(ndev); free_netdev(ndev);
return rc; return rc;
} }
...@@ -1956,6 +1961,7 @@ static int davinci_emac_remove(struct platform_device *pdev) ...@@ -1956,6 +1961,7 @@ static int davinci_emac_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
struct emac_priv *priv = netdev_priv(ndev); struct emac_priv *priv = netdev_priv(ndev);
struct device_node *np = pdev->dev.of_node;
dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n");
...@@ -1968,6 +1974,8 @@ static int davinci_emac_remove(struct platform_device *pdev) ...@@ -1968,6 +1974,8 @@ static int davinci_emac_remove(struct platform_device *pdev)
unregister_netdev(ndev); unregister_netdev(ndev);
of_node_put(priv->phy_node); of_node_put(priv->phy_node);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
if (of_phy_is_fixed_link(np))
of_phy_deregister_fixed_link(np);
free_netdev(ndev); free_netdev(ndev);
return 0; return 0;
......
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