e1000: IRQ resources cleanup

irq leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: if
e1000_up fails in e1000_open() we do not free allocated irq

Signed-off-by: Vasily Averin <vvs@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
Vasily Averin 2006-08-28 14:56:19 -07:00 committed by Auke Kok
parent 8fc897b00a
commit 401a552b8b

View File

@ -1207,7 +1207,7 @@ e1000_open(struct net_device *netdev)
err = e1000_request_irq(adapter);
if (err)
goto err_up;
goto err_req_irq;
e1000_power_up_phy(adapter);
@ -1228,6 +1228,9 @@ e1000_open(struct net_device *netdev)
return E1000_SUCCESS;
err_up:
e1000_power_down_phy(adapter);
e1000_free_irq(adapter);
err_req_irq:
e1000_free_all_rx_resources(adapter);
err_setup_rx:
e1000_free_all_tx_resources(adapter);