qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

Revert "ar71xx: move phy_connect call to ag71xx_open" (r18691)

Browse Source 
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
This commit is contained in:
nbd 2009-12-15 22:37:54 +00:00
parent 3ba1ad5713
commit 483781cdb7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View File

@ -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);