[BONDING]: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls

[linux-2.6-omap-h63xx.git] / drivers / net / 3c59x.c

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80bdcf8462343434fae03cb3091dade3646854ee..716a47210aa326676df0c2945e5cf9d5e072ae29 100644 (file)
--- 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);
 }