Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3594056pxv; Mon, 28 Jun 2021 08:10:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiVMD5SBnmiVoeg+aDKyj30joQ/NTisfFGiEBbEa6NG7/b3OVaZFYujefVOMiTkrS8F4pM X-Received: by 2002:a17:907:9f0:: with SMTP id ce16mr25602214ejc.126.1624893044631; Mon, 28 Jun 2021 08:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624893044; cv=none; d=google.com; s=arc-20160816; b=1EsbZMOR2xEOE3YhWgD1KcvB4WOjltlmC1RPPDX/cXthOp0X7AEMmSGDm/0UoOQjYm 9fDIw5v0o9c8l+Q8LpYl4rLalbx/E9zBKP+gitibgWZYdrieNgbxmyY6GuWClw2VLrus MiZ6H5vgfLqAox3VXLMZJQIDyku+3ugyn4Yk9OQKUMtehiNug6rXwrXka4el6yurLv+c eHmhdOxm3OMZkLNLuXya3mx/iU1Dth+0+EG5inJVsHCbYd3JlEm7f0868CmLhERkXFZf ISAIQ6CqWFpogcUGwwxODIh3lBrHVQO38Tg430pZzBfQGun5zyUMPyt89+Efv9SquZsY 9Uig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zL/VxG7yCIJivSENHAhXflbkaoPFfdxcyKRXtFvKfCQ=; b=L8tinAFcDVWAMZSxleJtfEUTUJvocvYXxJTo4WBloA/OrcjuMl1qVcy8yQVVa75k7B p9yPCOWlKjEl0gs9CGM3q01yUf1sR4sOiv2v8lAUIzTVwLmxmxcIGQrsnljrBqB9i9Hu ySA8Ycp4dk00Ldt+qwMSju4GfBAcLkmZJw5G1w3L2DWW7gPNqPJP0GHctniJ9sPqh5Ii dzj/4DkiJrnU5hUTXlSP46G76sSqwgOMHR1LD/3uqCyZ6vG02aNAYNXtNm19GfK5bLg1 0Urvz80SA5QF4Vx9oodJlS8g7O1ICo2gNMm4iMBU8cn+mddCjqz/3Ae6aGy79mVGG/K2 hofg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UBo7XU2d; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u4si7267869ejy.271.2021.06.28.08.10.20; Mon, 28 Jun 2021 08:10:44 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UBo7XU2d; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236202AbhF1PKn (ORCPT + 99 others); Mon, 28 Jun 2021 11:10:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:55274 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236648AbhF1OuE (ORCPT ); Mon, 28 Jun 2021 10:50:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F3D561D25; Mon, 28 Jun 2021 14:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624891017; bh=9FeWh6NOJYEvQc5ECtPtnkzo3aSKhubpbD6nt0RtdVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UBo7XU2dIoBm2INMB0ctP4dC920iTDDntWw+Cy+3dSiLIG4jyZwHvjbobc/D9viMn JbChaIXAiJThRM2UVocbhL6hl7NNN/zxE76QV+Idh4jgcxWsz39AbDplj+eNOaOcob 7xsGOkLnkj7OWipsaI6ELPndzDPcpd8PExapwjROTDmBLP2s77CQjL9zET0klMv1BF nB7muheuXIzF8+8OqFfBegZ40j6cjw3+E1go2ne2iBf1yBKnEHT8jT/Oa4o/62F7yx w/Zz8PP4z5i6VIXf1xTehisCnjDuSbAUqI2FPirVgyqRWvY2UlnaXoS+e5FZt3pvYP MiK9hSq19nA1g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , "David S . Miller" , Sasha Levin Subject: [PATCH 4.14 31/88] netxen_nic: Fix an error handling path in 'netxen_nic_probe()' Date: Mon, 28 Jun 2021 10:35:31 -0400 Message-Id: <20210628143628.33342-32-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628143628.33342-1-sashal@kernel.org> References: <20210628143628.33342-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.238-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.238-rc1 X-KernelTest-Deadline: 2021-06-30T14:36+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 49a10c7b176295f8fafb338911cf028e97f65f4d ] 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: e87ad5539343 ("netxen: support pci error handlers") Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 8f8a1894378e..5b91c8f823ff 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1624,6 +1624,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) free_netdev(netdev); err_out_free_res: + if (NX_IS_REVISION_P3(pdev->revision)) + pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); err_out_disable_pdev: -- 2.30.2