---

yaml --- r: 46585 b: refs/heads/master c: 0d38ff1 h: refs/heads/master i: 46583: 5c64941 v: v3
git-mirror · Feb 7, 2007 · 46434dc · 46434dc
1 parent b3677a3
commit 46434dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e3e8b05a90bcc5799b0d4525f23c80d661d0194
+refs/heads/master: 0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
@@ -792,8 +792,7 @@ static void poll_vortex(struct net_device *dev)
 {
 	struct vortex_private *vp = netdev_priv(dev);
 	unsigned long flags;
-	local_save_flags(flags);
-	local_irq_disable();
+	local_irq_save(flags);
 	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
 	local_irq_restore(flags);
 }