]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - drivers/net/e1000/e1000_main.c
[PATCH] e1000: Enable polling before enabling interrupts
[linux-3.10.git] / drivers / net / e1000 / e1000_main.c
index 03e3ec74f3fbaf821f2a28b0aa7bc6391bbcc571..9927106b76c7bd8714762389c4ed1c67843b302f 100644 (file)
@@ -328,11 +328,12 @@ e1000_up(struct e1000_adapter *adapter)
                return err;
 
        mod_timer(&adapter->watchdog_timer, jiffies);
                return err;
 
        mod_timer(&adapter->watchdog_timer, jiffies);
-       e1000_irq_enable(adapter);
 
 #ifdef CONFIG_E1000_NAPI
        netif_poll_enable(netdev);
 #endif
 
 #ifdef CONFIG_E1000_NAPI
        netif_poll_enable(netdev);
 #endif
+       e1000_irq_enable(adapter);
+
        return 0;
 }
 
        return 0;
 }