---

yaml --- r: 215201 b: refs/heads/master c: cdd861d h: refs/heads/master i: 215199: c91c973 v: v3
git-mirror · Oct 18, 2010 · c47db23 · c47db23
1 parent b493d26
commit c47db23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccc901ee58cfb090a31216a6eda0f1e9dfc572fa
+refs/heads/master: cdd861d68d27a0d0ebe4e641d20d8cfa5cef405f
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
@@ -772,7 +772,7 @@ static int ns83820_setup_rx(struct net_device *ndev)
 		phy_intr(ndev);
 
 		/* Okay, let it rip */
-		spin_lock_irq(&dev->misc_lock);
+		spin_lock(&dev->misc_lock);
 		dev->IMR_cache |= ISR_PHY;
 		dev->IMR_cache |= ISR_RXRCMP;
 		//dev->IMR_cache |= ISR_RXERR;