Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3937058pxj; Mon, 21 Jun 2021 09:45:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzknQa5xM7oSIX7XdGrCXdo9qdzNU4eBAvKW02godNLaCrklljgYy0shXdmQUCa3GYS7aHF X-Received: by 2002:a17:907:7717:: with SMTP id kw23mr18837430ejc.476.1624293914130; Mon, 21 Jun 2021 09:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293914; cv=none; d=google.com; s=arc-20160816; b=THOS40klhP+P940jliQRV5A4JONKCDTgWdtbg/6rsWJl13GUNMOz5zbvc9ONAkihVm lJgAy3zEWiaCR65LceXppA7nBLfghN8j08QZI+Oiuw6KpRt8Y3q9oOgecOM5lTKOmWha HyG6UGezQisUdAREn6+uDpecAyZf/oQZVHQETWUPRZ75jYkYOoTBDme8jMthmVwB6LoD rbn5z8DQ03lds111LYqlONkDGx6lPZh4GVfmi0jSpBjyJOyvyCSAU/+5tA9FnNq34m5X R6yJafNGwshD+0rnLwGVfiZvECmO32Vj/osEzH239BgYTqLlcoumLRNOeNMorVobk9+u qu9A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XufBl2+RZgGY+syu5kZIuJl+33z9Un9GVlkUai7wiRE=; b=GV3ukXNQYWOSANmpyVHJnkynPVwZUsDYJabggfdey8Db5Xzp8DcjJzJvvrIVxaqd8c g7jtPkDwx+8YeCgZ7I7blHcE/sqiEE7ZeYZbGAZEW3KsbipBwbvmTxDSN2KN+w54zFhh cWLPqe43HH4oX9NxZclik0pewr6/zRYiVLpQnG2NZ41P3IF3zTTQZ0MZdxfwiky2OAmo /qtayuyG2iucWVObHTIYDHlXDJES7/jmF+6Mu5f7y4c3lCxB1ROLdk1VRfXsP1lD8DZZ /8o7jOhzOMWTp5xtEFVfsRq1SS/A58kCGxcRbmCzQ3xyilLUxYz5X0lQxH0R12WZ57QQ JgbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=p92BSnvO; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bf28si16946597edb.224.2021.06.21.09.44.51; Mon, 21 Jun 2021 09:45:14 -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=@linuxfoundation.org header.s=korg header.b=p92BSnvO; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230498AbhFUQqG (ORCPT + 99 others); Mon, 21 Jun 2021 12:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:33866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232693AbhFUQlN (ORCPT ); Mon, 21 Jun 2021 12:41:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8299261444; Mon, 21 Jun 2021 16:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624293038; bh=ENY3uilQW+tI0SS/Q00NHr0qtpowEeeeG4r7e4h5EEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p92BSnvOgSqvobCnX6fbWH1c+iJ7oDUWd3F7lXtH51Gc27P4ahtO5KZpvRTtM/ja0 SaV+QEs7moIzK64CX2bPo2JwszJf6cPt+FhuMriSZ3QX5FnQGAn79QqpUb/B8hk0TN mTuZ61IbZBy9ffPrJKsu2SYsX31sgPfczMIfTfpc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "David S. Miller" , Sasha Levin Subject: [PATCH 5.12 058/178] netxen_nic: Fix an error handling path in netxen_nic_probe() Date: Mon, 21 Jun 2021 18:14:32 +0200 Message-Id: <20210621154924.422233325@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210621154921.212599475@linuxfoundation.org> References: <20210621154921.212599475@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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 @@ err_out_free_netdev: 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