Commit ec7d1289 authored by Scott Feldman's avatar Scott Feldman Committed by Linus Torvalds

[e1000] request_irq() failure resulted in freeing twice

* Bug fix: request_irq() failure resulted in freeing resources twice!
  [Don Fry (brazilnut@us.ibm.com)]
parent 3b4e4982
...@@ -248,12 +248,8 @@ e1000_up(struct e1000_adapter *adapter) ...@@ -248,12 +248,8 @@ e1000_up(struct e1000_adapter *adapter)
e1000_alloc_rx_buffers(adapter); e1000_alloc_rx_buffers(adapter);
if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, if(request_irq(netdev->irq, &e1000_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
netdev->name, netdev)) { netdev->name, netdev))
e1000_reset_hw(&adapter->hw);
e1000_free_tx_resources(adapter);
e1000_free_rx_resources(adapter);
return -1; return -1;
}
mod_timer(&adapter->watchdog_timer, jiffies); mod_timer(&adapter->watchdog_timer, jiffies);
e1000_irq_enable(adapter); e1000_irq_enable(adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment