From e8f0848218fd921ee582b0c3d49b62038c7bdec0 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Thu, 13 May 2010 06:12:50 +0000
Subject: [PATCH] --- yaml --- r: 195084 b: refs/heads/master c:
 93135a3be0d909fabca9c4329177f71ae71b6847 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2974e840f3ed..75a907a7b3c2 100644
--- 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
index efc31e93eb78..f13a45f1db68 100644
--- 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];