From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 8 Aug 2012 21:51:18 +0000 (+0000)
Subject: nuport-mac: rework PHY interrupt configuration to avoid races
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f9bfa3fcd05aa1ee864ba07b8f74bd6cd6de025;p=openwrt%2Fstaging%2Fneocturne.git

nuport-mac: rework PHY interrupt configuration to avoid races

SVN-Revision: 33070
---

diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index 8cd3d0e6b6..833e6fa018 100644
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -765,7 +765,12 @@ static int nuport_mac_open(struct net_device *dev)
 		goto out_emac_clk;
 	}
 
-	phy_start(priv->phydev);
+	ret = request_irq(priv->tx_irq, &nuport_mac_tx_interrupt,
+				0, dev->name, dev);
+	if (ret) {
+		netdev_err(dev, "unable to request rx interrupt\n");
+		goto out_link_irq;
+	}
 
 	/* Enable link interrupt monitoring for our PHY address */
 	reg = LINK_INT_EN | (priv->phydev->addr << LINK_PHY_ADDR_SHIFT);
@@ -779,12 +784,7 @@ static int nuport_mac_open(struct net_device *dev)
 	nuport_mac_writel(LINK_POLL_MASK, LINK_INT_POLL_TIME);
 	spin_unlock_irqrestore(&priv->lock, flags);
 
-	ret = request_irq(priv->tx_irq, &nuport_mac_tx_interrupt,
-				0, dev->name, dev);
-	if (ret) {
-		netdev_err(dev, "unable to request rx interrupt\n");
-		goto out_link_irq;
-	}
+	phy_start(priv->phydev);
 
 	napi_enable(&priv->napi);