diff options
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 619c89218b4b..f293690b8fc2 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -1417,10 +1417,6 @@ e1000_open(struct net_device *netdev) | |||
1417 | if ((err = e1000_setup_all_rx_resources(adapter))) | 1417 | if ((err = e1000_setup_all_rx_resources(adapter))) |
1418 | goto err_setup_rx; | 1418 | goto err_setup_rx; |
1419 | 1419 | ||
1420 | err = e1000_request_irq(adapter); | ||
1421 | if (err) | ||
1422 | goto err_req_irq; | ||
1423 | |||
1424 | e1000_power_up_phy(adapter); | 1420 | e1000_power_up_phy(adapter); |
1425 | 1421 | ||
1426 | if ((err = e1000_up(adapter))) | 1422 | if ((err = e1000_up(adapter))) |
@@ -1431,6 +1427,10 @@ e1000_open(struct net_device *netdev) | |||
1431 | e1000_update_mng_vlan(adapter); | 1427 | e1000_update_mng_vlan(adapter); |
1432 | } | 1428 | } |
1433 | 1429 | ||
1430 | err = e1000_request_irq(adapter); | ||
1431 | if (err) | ||
1432 | goto err_req_irq; | ||
1433 | |||
1434 | /* If AMT is enabled, let the firmware know that the network | 1434 | /* If AMT is enabled, let the firmware know that the network |
1435 | * interface is now open */ | 1435 | * interface is now open */ |
1436 | if (adapter->hw.mac_type == e1000_82573 && | 1436 | if (adapter->hw.mac_type == e1000_82573 && |
@@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev) | |||
1439 | 1439 | ||
1440 | return E1000_SUCCESS; | 1440 | return E1000_SUCCESS; |
1441 | 1441 | ||
1442 | err_req_irq: | ||
1443 | e1000_down(adapter); | ||
1442 | err_up: | 1444 | err_up: |
1443 | e1000_power_down_phy(adapter); | 1445 | e1000_power_down_phy(adapter); |
1444 | e1000_free_irq(adapter); | ||
1445 | err_req_irq: | ||
1446 | e1000_free_all_rx_resources(adapter); | 1446 | e1000_free_all_rx_resources(adapter); |
1447 | err_setup_rx: | 1447 | err_setup_rx: |
1448 | e1000_free_all_tx_resources(adapter); | 1448 | e1000_free_all_tx_resources(adapter); |