---

yaml --- r: 195084 b: refs/heads/master c: 93135a3 h: refs/heads/master v: v3
git-mirror · May 14, 2010 · e8f0848 · e8f0848
1 parent 1d70e14
commit e8f0848
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df01093bb08916f434ebedde4610805d4105d05f
+refs/heads/master: 93135a3be0d909fabca9c4329177f71ae71b6847
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3320,10 +3320,10 @@ static void sky2_restart(struct work_struct *work)
 
 	rtnl_lock();
 
-	napi_disable(&hw->napi);
-	synchronize_irq(hw->pdev->irq);
 	imask = sky2_read32(hw, B0_IMSK);
 	sky2_write32(hw, B0_IMSK, 0);
+	synchronize_irq(hw->pdev->irq);
+	napi_disable(&hw->napi);
 
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];