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); }