summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2008-11-14 06:45:07 +0000
committerDavid S. Miller <davem@davemloft.net>2008-11-16 19:05:02 -0800
commite82f54ba030b429c06b5240cbe7eeaaa03a8db11 (patch)
treec1502656045e4aa37d2f6379484a4eaab1922eab
parent3ee82383f0098a2e13acc8cf1be8e47512f41e5a (diff)
downloadop-kernel-dev-e82f54ba030b429c06b5240cbe7eeaaa03a8db11.zip
op-kernel-dev-e82f54ba030b429c06b5240cbe7eeaaa03a8db11.tar.gz
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>
-rw-r--r--drivers/net/e1000e/netdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 2c8dffd..f6ebebb 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5009,6 +5009,7 @@ err_hw_init:
err_sw_init:
if (adapter->hw.flash_address)
iounmap(adapter->hw.flash_address);
+ e1000e_reset_interrupt_capability(adapter);
err_flashmap:
iounmap(adapter->hw.hw_addr);
err_ioremap:
OpenPOWER on IntegriCloud