---

yaml --- r: 162911 b: refs/heads/master c: e99b1f0 h: refs/heads/master i: 162909: 2136333 162907: 925abde 162903: bed55ef 162895: 051d3d7 162879: 67c690d v: v3
git-mirror · Sep 17, 2009 · 3d3cf26 · 3d3cf26
1 parent 33b92cc
commit 3d3cf26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3933fc952a5a5af4cf23fca94e20203251c9d825
+refs/heads/master: e99b1f04d922f132ffab8310b470bcc93d3ddf80
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
@@ -847,23 +847,22 @@ static int b44_poll(struct napi_struct *napi, int budget)
 {
 	struct b44 *bp = container_of(napi, struct b44, napi);
 	int work_done;
+	unsigned long flags;
 
-	spin_lock_irq(&bp->lock);
+	spin_lock_irqsave(&bp->lock, flags);
 
 	if (bp->istat & (ISTAT_TX | ISTAT_TO)) {
 		/* spin_lock(&bp->tx_lock); */
 		b44_tx(bp);
 		/* spin_unlock(&bp->tx_lock); */
 	}
-	spin_unlock_irq(&bp->lock);
+	spin_unlock_irqrestore(&bp->lock, flags);
 
 	work_done = 0;
 	if (bp->istat & ISTAT_RX)
 		work_done += b44_rx(bp, budget);
 
 	if (bp->istat & ISTAT_ERRORS) {
-		unsigned long flags;
-
 		spin_lock_irqsave(&bp->lock, flags);
 		b44_halt(bp);
 		b44_init_rings(bp);