1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index cbc7febe9cdc..9ec35b7a8207 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1325,7 +1325,10 @@ e1000_sw_init(struct e1000_adapter *adapter)
         spin_lock_init(&adapter->tx_queue_lock);
 #endif
 
-        atomic_set(&adapter->irq_sem, 1);
+        /* Explicitly disable IRQ since the NIC can be in any state. */
+        atomic_set(&adapter->irq_sem, 0);
+        e1000_irq_disable(adapter);
+
         spin_lock_init(&adapter->stats_lock);
 
         set_bit(__E1000_DOWN, &adapter->flags);
@@ -1431,6 +1434,10 @@ e1000_open(struct net_device *netdev)
         /* From here on the code is the same as e1000_up() */
         clear_bit(__E1000_DOWN, &adapter->flags);
 
+#ifdef CONFIG_E1000_NAPI
+        netif_poll_enable(netdev);
+#endif
+
         e1000_irq_enable(adapter);
 
         /* fire a link status change interrupt to start the watchdog */