Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ed1635 authored by Kok, Auke's avatar Kok, Auke Committed by Jeff Garzik
Browse files

e1000: fix shared interrupt warning message 



Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 36fe55d6

drivers/net/e1000/e1000_main.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1417,10 +1417,6 @@ e1000_open(struct net_device *netdev) 
	if ((err = e1000_setup_all_rx_resources(adapter)))

	if ((err = e1000_setup_all_rx_resources(adapter)))

		goto err_setup_rx;

		goto err_setup_rx;





	err = e1000_request_irq(adapter);

	if (err)

		goto err_req_irq;



	e1000_power_up_phy(adapter);

	e1000_power_up_phy(adapter);





	if ((err = e1000_up(adapter)))

	if ((err = e1000_up(adapter)))
@@ -1431,6 +1427,10 @@ e1000_open(struct net_device *netdev) 
		e1000_update_mng_vlan(adapter);

		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

	/* If AMT is enabled, let the firmware know that the network

	 * interface is now open */

	 * interface is now open */

	if (adapter->hw.mac_type == e1000_82573 &&

	if (adapter->hw.mac_type == e1000_82573 &&
@@ -1439,10 +1439,10 @@ e1000_open(struct net_device *netdev) 




	return E1000_SUCCESS;

	return E1000_SUCCESS;





err_req_irq:

	e1000_down(adapter);

err_up:

err_up:

	e1000_power_down_phy(adapter);

	e1000_power_down_phy(adapter);

	e1000_free_irq(adapter);

err_req_irq:

	e1000_free_all_rx_resources(adapter);

	e1000_free_all_rx_resources(adapter);

err_setup_rx:

err_setup_rx:

	e1000_free_all_tx_resources(adapter);

	e1000_free_all_tx_resources(adapter);