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

Commit 6c1e5abe authored by Thierry Reding's avatar Thierry Reding Committed by David S. Miller
Browse files

net: stmmac: Stop PHY and remove TX timer on error 



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: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fbb9dd8

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+5 −1
Original line number Diff line number Diff line
@@ -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 @@ static int stmmac_open(struct net_device *dev) 
		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: