Commit e82f54ba authored Nov 14, 2008 by Jeff Kirsher Committed by David S. Miller Nov 16, 2008

e1000e: fix warn_on reload after phy_id error

If the driver fails to initialize the first time due to the failure in the
phy_id check the kernel triggers a warn_on on the second try to load the
driver because the driver did not free the msi/x resources in the first
load because of the previous failure in phy_id check.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3ee82383

drivers/net/e1000e/netdev.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5009,6 +5009,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
	err_sw_init:		err_sw_init:
	if (adapter->hw.flash_address)		if (adapter->hw.flash_address)
	iounmap(adapter->hw.flash_address);		iounmap(adapter->hw.flash_address);
			e1000e_reset_interrupt_capability(adapter);
	err_flashmap:		err_flashmap:
	iounmap(adapter->hw.hw_addr);		iounmap(adapter->hw.hw_addr);
	err_ioremap:		err_ioremap: