From patchwork Sat Nov 8 00:27:39 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: 7832 X-Patchwork-Delegate: jgarzik@pobox.com 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 14FA4DDDED for ; Sat, 8 Nov 2008 11:29:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752403AbYKHA2M (ORCPT ); Fri, 7 Nov 2008 19:28:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752000AbYKHA2L (ORCPT ); Fri, 7 Nov 2008 19:28:11 -0500 Received: from qmta02.emeryville.ca.mail.comcast.net ([76.96.30.24]:41410 "EHLO QMTA02.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbYKHA2K (ORCPT ); Fri, 7 Nov 2008 19:28:10 -0500 Received: from OMTA10.emeryville.ca.mail.comcast.net ([76.96.30.28]) by QMTA02.emeryville.ca.mail.comcast.net with comcast id cJ9K1a00U0cQ2SLA2QU9Xx; Sat, 08 Nov 2008 00:28:09 +0000 Received: from gitlost.lost ([63.64.152.142]) by OMTA10.emeryville.ca.mail.comcast.net with comcast id cQTf1a00E34bfcX8WQThBv; Sat, 08 Nov 2008 00:28:07 +0000 X-Authority-Analysis: v=1.0 c=1 a=bUnbG8DxrIEA:10 a=SkX0Ik-wEoMA:10 a=rPwdPPfrhJ0ZWj3kIOEA:9 a=eucXCwDdD4A2OJzlFeNgoSjn5FsA:4 a=f3vTY2RCmVgA:10 From: Jeff Kirsher Subject: [PATCH] e1000e: fix warn_on reload after phy_id error To: jeff@garzik.org Cc: netdev@vger.kernel.org, davem@davemloft.net Date: Fri, 07 Nov 2008 16:27:39 -0800 Message-ID: <20081108002739.17508.60954.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. --- 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: