[e1000] request_irq() failure resulted in freeing twice

* Bug fix: request_irq() failure resulted in freeing resources twice!
  [Don Fry (brazilnut@us.ibm.com)]

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f3dcd6998a5043a2e9689a1e07230790f4808808..4a522349aa4867daf8e6396f04e83d7adfaa8433 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -248,12 +248,8 @@ e1000_up(struct e1000_adapter *adapter)
        e1000_alloc_rx_buffers(adapter);
 
        if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
-                      netdev->name, netdev)) {
-               e1000_reset_hw(&adapter->hw);
-               e1000_free_tx_resources(adapter);
-               e1000_free_rx_resources(adapter);
+                      netdev->name, netdev))
                return -1;
-       }
 
        mod_timer(&adapter->watchdog_timer, jiffies);
        e1000_irq_enable(adapter);