From 46434dc6b94604ea5ad363f1948f5755d8248aff Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 5 Feb 2007 16:29:48 -0800
Subject: [PATCH] --- yaml --- r: 46585 b: refs/heads/master c:
 0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee h: refs/heads/master i:   46583:
 5c649417df92dae882d7f2523639867c3d8f4cb7 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/3c59x.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f9d6929ee200..96f7927a5cbf 100644
--- 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
index 80bdcf846234..716a47210aa3 100644
--- 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);
 }