diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-12-15 22:37:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-12-15 22:37:54 +0000 |
| commit | d560a3be458ec52be31980ba2ae6b7993b0a1ab4 (patch) | |
| tree | 6a3bf3900b28ccf3bb6984b161ed1b74e16cd24d /target/linux/ar71xx/files | |
| parent | 23475e7fc6626884b62c9d21e967183c2059019c (diff) | |
| download | upstream-d560a3be458ec52be31980ba2ae6b7993b0a1ab4.tar.gz upstream-d560a3be458ec52be31980ba2ae6b7993b0a1ab4.tar.bz2 upstream-d560a3be458ec52be31980ba2ae6b7993b0a1ab4.zip | |
Revert "ar71xx: move phy_connect call to ag71xx_open" (r18691)
It's causing issues with switch drivers that register with swconfig and
makes fixing those unnecessarily complicated.
Fixes rtl8306 switch support on the WRT160NL.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 23 |
1 files changed, 12 insertions, 11 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 ebcb907cbb..c8c61dead6 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -435,16 +435,12 @@ static void ag71xx_hw_stop(struct ag71xx *ag) static int ag71xx_open(struct net_device *dev) { struct ag71xx *ag = netdev_priv(dev); - int err; + int ret; - err = ag71xx_phy_connect(ag); - if (err) + ret = ag71xx_rings_init(ag); + if (ret) goto err; - err = ag71xx_rings_init(ag); - if (err) - goto err_ring_cleanup; - napi_enable(&ag->napi); netif_carrier_off(dev); @@ -461,10 +457,9 @@ static int ag71xx_open(struct net_device *dev) return 0; - err_ring_cleanup: - ag71xx_rings_cleanup(ag); err: - return err; + ag71xx_rings_cleanup(ag); + return ret; } static int ag71xx_stop(struct net_device *dev) @@ -487,7 +482,6 @@ static int ag71xx_stop(struct net_device *dev) spin_unlock_irqrestore(&ag->lock, flags); ag71xx_rings_cleanup(ag); - ag71xx_phy_disconnect(ag); return 0; } @@ -924,10 +918,16 @@ static int __init ag71xx_probe(struct platform_device *pdev) ag71xx_dump_regs(ag); + 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: @@ -948,6 +948,7 @@ 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); |