From patchwork Fri Nov 14 16:45:07 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 8773 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1B772DDDF9 for ; Sat, 15 Nov 2008 03:45:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751523AbYKNQp2 (ORCPT ); Fri, 14 Nov 2008 11:45:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751511AbYKNQp1 (ORCPT ); Fri, 14 Nov 2008 11:45:27 -0500 Received: from qmta08.emeryville.ca.mail.comcast.net ([76.96.30.80]:60426 "EHLO QMTA08.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918AbYKNQp0 (ORCPT ); Fri, 14 Nov 2008 11:45:26 -0500 Received: from OMTA06.emeryville.ca.mail.comcast.net ([76.96.30.51]) by QMTA08.emeryville.ca.mail.comcast.net with comcast id f15a1a00116AWCUA84lQMX; Fri, 14 Nov 2008 16:45:25 +0000 Received: from gitlost.lost ([63.64.152.142]) by OMTA06.emeryville.ca.mail.comcast.net with comcast id f4l71a00n34bfcX8S4l91s; Fri, 14 Nov 2008 16:45:20 +0000 X-Authority-Analysis: v=1.0 c=1 a=_-lY9D24dbkA:10 a=IxiCpgZ7stYA:10 a=rPwdPPfrhJ0ZWj3kIOEA:9 a=7g_kuqcT11XwANj7KXM39Qkeui0A:4 a=dGJ0OcVc7YAA:10 a=f3vTY2RCmVgA:10 From: Jeff Kirsher Subject: [PATCH 1/2] e1000e: fix warn_on reload after phy_id error To: jeff@garzik.org Cc: netdev@vger.kernel.org, davem@davemloft.net, Jeff Kirsher Date: Fri, 14 Nov 2008 08:45:07 -0800 Message-ID: <20081114164507.5342.19559.stgit@gitlost.lost> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/e1000e/netdev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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: