From 4458ce743530f7a2097b177374f2af3132a2ccf0 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 23 Jun 2008 10:41:23 +0200
Subject: [PATCH] --- yaml --- r: 98539 b: refs/heads/master c:
 c5643cab7bf663ae049b11be43de8819683176dd h: refs/heads/master i:   98537:
 0b4832dc9b134fe435e799bb8749693e7073700b   98535:
 8398612a0abcf7b5a61864f630ae06d7aeaa24aa v: v3

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

diff --git a/[refs] b/[refs]
index cddc3c56c005..bdf58bea7c37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8399fed7e9f2e76eb65852612b16732129b9f3f
+refs/heads/master: c5643cab7bf663ae049b11be43de8819683176dd
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
index 2edda8cc7f99..aabad8ce7458 100644
--- a/trunk/drivers/net/3c59x.c
+++ b/trunk/drivers/net/3c59x.c
@@ -1768,9 +1768,10 @@ vortex_timer(unsigned long data)
 	case XCVR_MII: case XCVR_NWAY:
 		{
 			ok = 1;
-			spin_lock_bh(&vp->lock);
+			/* Interrupts are already disabled */
+			spin_lock(&vp->lock);
 			vortex_check_media(dev, 0);
-			spin_unlock_bh(&vp->lock);
+			spin_unlock(&vp->lock);
 		}
 		break;
 	  default:					/* Other media types handled by Tx timeouts. */