net: stmmac: Stop PHY and remove TX timer on error
authorThierry Reding <treding@nvidia.com>
Fri, 10 Mar 2017 16:34:54 +0000 (17:34 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Mar 2017 06:35:19 +0000 (23:35 -0700)
If an error occurs while opening the device, make sure that both the TX
timer and the PHY are properly cleaned up.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 4498a3861aa3ad09460e922bd7f38e3506889dcb..7c38c9baf23844d6028bb59dbc0843ec69ee4be4 100644 (file)
@@ -1821,7 +1821,7 @@ static int stmmac_open(struct net_device *dev)
                netdev_err(priv->dev,
                           "%s: ERROR: allocating the IRQ %d (error: %d)\n",
                           __func__, dev->irq, ret);
-               goto init_error;
+               goto irq_error;
        }
 
        /* Request the Wake IRQ in case of another line is used for WoL */
@@ -1858,7 +1858,11 @@ lpiirq_error:
                free_irq(priv->wol_irq, dev);
 wolirq_error:
        free_irq(dev->irq, dev);
+irq_error:
+       if (dev->phydev)
+               phy_stop(dev->phydev);
 
+       del_timer_sync(&priv->txtimer);
 init_error:
        free_dma_desc_resources(priv);
 dma_desc_error: