summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorVasily Averin <vvs@sw.ru>2006-08-28 14:56:19 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-08-28 14:56:19 -0700
commit401a552b8b318d594fc44d36e3da13ad475a41f7 (patch)
treea8d2e8e93a7ce29bc8949bc270a8248e795cc2e7 /drivers/net/e1000
parent8fc897b00a7d81ffaa24e18881c2d6b10698ab0b (diff)
downloadop-kernel-dev-401a552b8b318d594fc44d36e3da13ad475a41f7.zip
op-kernel-dev-401a552b8b318d594fc44d36e3da13ad475a41f7.tar.gz
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>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 610a0cd..354d778 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -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);
OpenPOWER on IntegriCloud