---

yaml --- r: 98539 b: refs/heads/master c: c5643ca h: refs/heads/master i: 98537: 0b4832d 98535: 8398612 v: v3
git-mirror · Jun 27, 2008 · 4458ce7 · 4458ce7
1 parent a8329d3
commit 4458ce7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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. */