From patchwork Wed Jun 12 17:47:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dean Nelson X-Patchwork-Id: 250852 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 91F332C0098 for ; Thu, 13 Jun 2013 03:48:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757777Ab3FLRsM (ORCPT ); Wed, 12 Jun 2013 13:48:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43209 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754886Ab3FLRsL (ORCPT ); Wed, 12 Jun 2013 13:48:11 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5CHlmig004023 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 Jun 2013 13:47:48 -0400 Received: from [127.0.0.1] (ovpn-113-84.phx2.redhat.com [10.3.113.84]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5CHllgq001708; Wed, 12 Jun 2013 13:47:48 -0400 Date: Wed, 12 Jun 2013 13:47:47 -0400 From: Dean Nelson To: David Miller Cc: Konstantin Khlebnikov , netdev@vger.kernel.org, Jeff Kirsher , Bruce Allan Message-Id: <20130612174747.7449.40767.email-sent-by-dnelson@teal> Subject: [PATCH net-next] e1000e: restore call to pci_clear_master() X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In attempting to resolve a minor merge conflict, commit e5f2ef7ab4690d2e8faa accidently dropped a call to pci_clear_master() that was intended to remain in place. Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by one to pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a number of lines starting two lines following that call. This patch restores the call to pci_clear_master() in __e1000_shutdown(). Signed-off-by: Dean Nelson --- Both stable 3.8.y and 3.9.y appear to have the call to pci_clear_master() in __e1000_shutdown() as desired. I'm not sure how they avoided the conflict. drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 file changed, 2 insertions(+) -- 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/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 77f81cb..5475cf4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5995,6 +5995,8 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) */ e1000e_release_hw_control(adapter); + pci_clear_master(pdev); + /* The pci-e switch on some quad port adapters will report a * correctable error when the MAC transitions from D0 to D3. To * prevent this we need to mask off the correctable errors on the