From ab314290c6a49844d1c30be6a21b494f5a37bc1c Mon Sep 17 00:00:00 2001 From: "Kok, Auke" Date: Fri, 16 Feb 2007 14:39:26 -0800 Subject: [PATCH] --- yaml --- r: 49045 b: refs/heads/master c: d2ed16356ff4fb9de23fbc5e5d582ce580390106 h: refs/heads/master i: 49043: a426e3f4c548e5aeef08f188b5c2b06d4243fa5c v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c0a7d954bd1b..3157cc7532a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36fe55d6a3c7096a7dc852010865c63d572aeaf4 +refs/heads/master: d2ed16356ff4fb9de23fbc5e5d582ce580390106 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 619c89218b4b..f293690b8fc2 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1417,10 +1417,6 @@ e1000_open(struct net_device *netdev) if ((err = e1000_setup_all_rx_resources(adapter))) goto err_setup_rx; - err = e1000_request_irq(adapter); - if (err) - goto err_req_irq; - e1000_power_up_phy(adapter); if ((err = e1000_up(adapter))) @@ -1431,6 +1427,10 @@ e1000_open(struct net_device *netdev) e1000_update_mng_vlan(adapter); } + err = e1000_request_irq(adapter); + if (err) + goto err_req_irq; + /* If AMT is enabled, let the firmware know that the network * interface is now open */ if (adapter->hw.mac_type == e1000_82573 && @@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev) return E1000_SUCCESS; +err_req_irq: + e1000_down(adapter); 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);