diff options
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index 72d2acced..28708f421 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -435,12 +435,16 @@ static void ag71xx_hw_stop(struct ag71xx *ag) static int ag71xx_open(struct net_device *dev) { struct ag71xx *ag = netdev_priv(dev); - int ret; + int err; - ret = ag71xx_rings_init(ag); - if (ret) + err = ag71xx_phy_connect(ag); + if (err) goto err; + err = ag71xx_rings_init(ag); + if (err) + goto err_ring_cleanup; + napi_enable(&ag->napi); netif_carrier_off(dev); @@ -457,9 +461,10 @@ static int ag71xx_open(struct net_device *dev) return 0; - err: + err_ring_cleanup: ag71xx_rings_cleanup(ag); - return ret; + err: + return err; } static int ag71xx_stop(struct net_device *dev) @@ -482,6 +487,7 @@ static int ag71xx_stop(struct net_device *dev) spin_unlock_irqrestore(&ag->lock, flags); ag71xx_rings_cleanup(ag); + ag71xx_phy_disconnect(ag); return 0; } @@ -913,16 +919,10 @@ static int __init ag71xx_probe(struct platform_device *pdev) mutex_unlock(&ag->mii_bus->mdio_lock); } - err = ag71xx_phy_connect(ag); - if (err) - goto err_unregister_netdev; - platform_set_drvdata(pdev, dev); return 0; - err_unregister_netdev: - unregister_netdev(dev); err_free_irq: free_irq(dev->irq, dev); err_unmap_mii_ctrl: @@ -943,7 +943,6 @@ static int __exit ag71xx_remove(struct platform_device *pdev) if (dev) { struct ag71xx *ag = netdev_priv(dev); - ag71xx_phy_disconnect(ag); unregister_netdev(dev); free_irq(dev->irq, dev); iounmap(ag->mii_ctrl); |