summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-02-05 16:29:48 -0800
committerJeff Garzik <jeff@garzik.org>2007-02-06 19:10:33 -0500
commit0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee (patch)
tree74119f183154e1b59013ae15da3b997ccd3f014c /drivers/net
parent7e3e8b05a90bcc5799b0d4525f23c80d661d0194 (diff)
downloadlinux-0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee.tar.bz2
NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
drivers/net/3c59x.c::poll_vortex() contains local_irq_disable() after local_save_flags(). Turn it into local_irq_save(). Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c59x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80bdcf846234..716a47210aa3 100644
--- a/drivers/net/3c59x.c
+++ b/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);
}