X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2F3c59x.c;h=aabad8ce7458c852a496422991c0683c0fe43d26;hb=bd8a59e29726b2a5ff7baefe995febdc63044a61;hp=2edda8cc7f9999af1e5f772df389c20719373190;hpb=c203e45f069af47ca7623e4dcd8c00bfba2722e4;p=linux-2.6

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 2edda8cc7f..aabad8ce74 100644
--- a/drivers/net/3c59x.c
+++ b/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. */