From: Jeff Kirsher Date: Fri, 14 Nov 2008 06:45:07 +0000 (+0000) Subject: e1000e: fix warn_on reload after phy_id error X-Git-Tag: v2.6.28-rc6~62^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e82f54ba030b429c06b5240cbe7eeaaa03a8db11;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 2c8dffdc889..f6ebebb8cfa 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: