Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4503834pxj; Tue, 22 Jun 2021 01:33:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycGeT1s4RYMKpP4c91MWZ0hsQY9ZuXnQVxTyg2j7iPs5KR6khxZ35piEDn0kWxQIsSnMFe X-Received: by 2002:a5d:8752:: with SMTP id k18mr1914971iol.139.1624350803600; Tue, 22 Jun 2021 01:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624350803; cv=none; d=google.com; s=arc-20160816; b=vzpc/Eb96ff1Q31DjFuZcWBFwByNh2Ld0DCho/ZSdSmy5BX+8s89Fhetr2Pw5MdO01 BzYjq7gufNiJIGdpIgwTig/ANo3NRR3FuljVbtqSYoiNmjLJfdSPRCKgkwsoL4PKNil3 vyogaCbHCHjZ4LrkZ6FNGBVq8t7Gusx/OUGd+PhHnSD2p+gbMU8a45L9dm3zlME+f+sE 4rUGQ34GkVwSvWQAgENLL9lgA8dQ/7D8+l2sLvRBc8sWmaXWGrB0D+vJPZeQCsfD5A8e pb+pzSyKQMAUnAjvRjpt6QYgSqUBT2hLtoQJVtohkZiG538fW/6WoeJ44XbvqAUuRJmr GWzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:ironport-sdr:ironport-sdr; bh=GXqbycokrorHUzbqHyepNAekLZZqRX9WxBJ7OGQjadE=; b=p2Qw/B5MeWKBgubM+QrUZ0yyW1Y+VJ9PVHoXGpi0cUEzTAEb6zFJuqtD8DB/xgt4k6 Bm7yp7h6MghfQ7kChDdLMTtcYx5z66NNny0H9//Smp7sxwnhZUdiP6kLP4u+1Tk/x9+l ZuhQK+f98aSrxBDep3HBce0HsVrgAesrxirq0TAx9QiJUeJNFCJHs7c1Z10EbsGLNqZd XbLAlAQriY4o8YjNNYvcxK5uhyluIHXzwST9+x8/PRocpbGwl29kRIdhNO3vWyTATosT 57pilKWr1j5ucf01pPCrtgXZQ+0roY9zpaSJhA9D40sRUg3jz4ZAgOBumo6paSTFblEy MjLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p11si21826151ioo.38.2021.06.22.01.33.11; Tue, 22 Jun 2021 01:33:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbhFVIeH (ORCPT + 99 others); Tue, 22 Jun 2021 04:34:07 -0400 Received: from mga02.intel.com ([134.134.136.20]:9523 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229628AbhFVIeH (ORCPT ); Tue, 22 Jun 2021 04:34:07 -0400 IronPort-SDR: IPThxi2VB99ay812jsrB0XPHj1OqaMIBqIE8AXIZ6zb+imGGk96xbv26aOG4YJW3IYRwX0CwQB g/Skx8YTnTZg== X-IronPort-AV: E=McAfee;i="6200,9189,10022"; a="194150643" X-IronPort-AV: E=Sophos;i="5.83,291,1616482800"; d="scan'208";a="194150643" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2021 01:31:34 -0700 IronPort-SDR: JWFZFk1oPOMYrDwszmAKBB9hfqFqn3B9kATAqjc1YYWnE9dSSmT4N2lIRkf0QjbGCJ635WjV49 1d5ilXF2yhqw== X-IronPort-AV: E=Sophos;i="5.83,291,1616482800"; d="scan'208";a="452528472" Received: from unknown (HELO [10.185.169.18]) ([10.185.169.18]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2021 01:31:31 -0700 Subject: Re: [Intel-wired-lan] [PATCH] e1000e: Fix an error handling path in 'e1000_probe()' To: Christophe JAILLET , jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com, davem@davemloft.net, kuba@kernel.org, "Edri, Michael" Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-kernel@vger.kernel.org, "Neftin, Sasha" References: <2651bb1778490c45d963122619fe3403fdf6b9de.1623819901.git.christophe.jaillet@wanadoo.fr> From: "Neftin, Sasha" Message-ID: <9622d773-323a-3022-e447-0586defd3732@intel.com> Date: Tue, 22 Jun 2021 11:31:29 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <2651bb1778490c45d963122619fe3403fdf6b9de.1623819901.git.christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/16/2021 08:05, Christophe JAILLET wrote: > If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it > must be undone by a corresponding 'pci_disable_pcie_error_reporting()' > call, as already done in the remove function. > > Fixes: 111b9dc5c981 ("e1000e: add aer support") > Signed-off-by: Christophe JAILLET > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > index 5435606149b0..c8aa69fd0405 100644 > --- a/drivers/net/ethernet/intel/e1000e/netdev.c > +++ b/drivers/net/ethernet/intel/e1000e/netdev.c > @@ -7662,6 +7662,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > err_ioremap: > free_netdev(netdev); > err_alloc_etherdev: > + pci_disable_pcie_error_reporting(pdev); > pci_release_mem_regions(pdev); > err_pci_reg: > err_dma: > Acked-by: Sasha Neftin