cnic: Convert cnic_local_flags to atomic ops.

[safe/jmp/linux-2.6] / drivers / net / smc-ultra.c

diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index f56f5e4..d2dd8e6 100644 (file)
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -196,7 +196,7 @@ static const struct net_device_ops ultra_netdev_ops = {
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = ei_poll,
+       .ndo_poll_controller    = ultra_poll,
 #endif
 };
 
@@ -421,7 +421,6 @@ ultra_reset_8390(struct net_device *dev)
                outb(0x01, cmd_port + 6);               /* Enable interrupts and memory. */
 
        if (ei_debug > 1) printk("reset done\n");
-       return;
 }
 
 /* Grab the 8390 specific header. Similar to the block_input routine, but