Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1354753pxj; Sat, 12 Jun 2021 06:12:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkoZnPW3dY48lOdYHjPANdOlmMG3jX7T8v6R5a+9GEfwVR/0F940Pld9zAJhsMeluC+LWX X-Received: by 2002:aa7:c445:: with SMTP id n5mr8535581edr.64.1623503540836; Sat, 12 Jun 2021 06:12:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623503540; cv=none; d=google.com; s=arc-20160816; b=zXtzFQnW/D+UQCF4mC+grxL3XHzU9m+iiqaRqLwHIp+tP16DEjhjSJqXyfM+/QBSXZ 1QhfvLJol0RYxNwTZutq5F9JX7SmnRl2kReASj1OBYS+ZvnO/CHjTc395Gu/szcTAM1/ PBDYDdufkWTXDFOW/hW6yVQuUw+DLjWiaYFCwzJY5Jx6WZAmAVlG85pEousSrhJjbnM6 hBTmQPOGdwgugE+TM0N4k6HZWggdSsj2dzIJeYXx29ce0s9WzZqUKS3CgDzaqLpJQT0D Cn6pF9qOXerCIuEWVKnci7QalcfbdlP/Se6j8hnBASbQGa3OqbNTbbKb1PsPlpa8/44A Iapg== 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 :message-id:date:subject:cc:to:from; bh=Q4JYRBpoKioCXgxjU36yo3JQ5pjbZDRnjXp4GnZP0eU=; b=eD4pT1Cxz9sNtOZpjG1Km4AgkwDyh2xBljZ2PhHRwvT8nM6yfN3Sq2omMaENTytNO5 6kUEJcdWxJjl2dxDwQn3v/YgM9wpP1pMjqAfqOpQ32qxqfR5tCi22Jetg2Q/QIn153Cs khencc8tPwYzq8UOpJ318P8qkb9Z0rp5qFFNyX3tuGNWxQtc+0aq9iw1OaapHmt9rjE8 v5jEUhrYUIlFqvlAYr6iJurWBIBhx3g9Zf89Ncqwa+BunX9BO2DirFy3+5F+ciT7N+CK 9z5m0CcaW4m3JwPfJVjgYD70TXWkBMTnB1DhoASVFaRAvaKbGZlwhMjDzLvMoc2gT8eF gD4g== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j13si7215809edr.332.2021.06.12.06.11.57; Sat, 12 Jun 2021 06:12:20 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231158AbhFLMzP (ORCPT + 99 others); Sat, 12 Jun 2021 08:55:15 -0400 Received: from smtp08.smtpout.orange.fr ([80.12.242.130]:38060 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230470AbhFLMzP (ORCPT ); Sat, 12 Jun 2021 08:55:15 -0400 Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d43 with ME id GCtE2500421Fzsu03CtESd; Sat, 12 Jun 2021 14:53:14 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 12 Jun 2021 14:53:14 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: manishc@marvell.com, rahulv@marvell.com, GR-Linux-NIC-Dev@marvell.com, davem@davemloft.net, kuba@kernel.org, amit.salecha@qlogic.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] netxen_nic: Fix an error handling path in 'netxen_nic_probe()' Date: Sat, 12 Jun 2021 14:53:12 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 7e6bac85495d..344ea1143454 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1602,6 +1602,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