---

yaml --- r: 35198 b: refs/heads/master c: 401a552 h: refs/heads/master v: v3
git-mirror · Aug 28, 2006 · 14d1b4c · 14d1b4c
1 parent 2c84dc0
commit 14d1b4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fc897b00a7d81ffaa24e18881c2d6b10698ab0b
+refs/heads/master: 401a552b8b318d594fc44d36e3da13ad475a41f7
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/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);