Commit 401a552b authored by Vasily Averin's avatar Vasily Averin Committed by Auke Kok

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: default avatarVasily Averin <vvs@sw.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 8fc897b0
......@@ -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);
......
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