diff --cc drivers/net/ethernet/faraday/ftgmac100.c index 4c546c3aef0f,444671b8bbe2..f3cc14cc757d --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@@ -1553,15 -1554,16 +1564,16 @@@ static int ftgmac100_open(struct net_de return 0; - err_ncsi: +err_ncsi: + phy_stop(netdev->phydev); napi_disable(&priv->napi); netif_stop_queue(netdev); - err_alloc: +err_alloc: ftgmac100_free_buffers(priv); free_irq(netdev->irq, netdev); - err_irq: +err_irq: netif_napi_del(&priv->napi); - err_hw: +err_hw: iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); ftgmac100_free_rings(priv); return err;