Skip to content

Commit

Permalink
e1000: IRQ resources cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vasily Averin authored and Auke Kok committed Aug 28, 2006
1 parent 8fc897b commit 401a552
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down

0 comments on commit 401a552

Please sign in to comment.