From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 15 Dec 2009 22:37:54 +0000 (+0000)
Subject: Revert "ar71xx: move phy_connect call to ag71xx_open" (r18691) It's causing issues... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a90a35f2bd8780fcc5a903b651ee0f56f337a76;p=openwrt%2Fstaging%2Fluka.git

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.

SVN-Revision: 18789
---

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