Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3890887pxv; Mon, 28 Jun 2021 15:51:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpgDzVbkeuQvI5YdodMYG54pp2Mao2kpGUYqvaJuyVYJWmV22805ixqRQeK84cbjND5bgg X-Received: by 2002:a92:da86:: with SMTP id u6mr19745928iln.215.1624920698111; Mon, 28 Jun 2021 15:51:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624920698; cv=none; d=google.com; s=arc-20160816; b=qBWVSrTM0dLbuGLiGhCOGLrZpcKCU96FqtiwixZGIknI52r1NdpdzsLdSzTt5t8bIf +AZ6w9l1ks9zEaOAzD/OzRlJOmLdII+CLY1W9sxPArkmjpu2G2HQPr7xYXl/i3HEnon3 KSF/G4Fl8CNM13J+ygbjYW8AU+BhOb1DvYw6RO+2CJsETWMQ6xwUSk2COY5bAmsm3IXQ fQmK2e41EnllLBR4BMW4rM/topGgyIYQYkyAHqTJ4w8KjRUlflAcusUfxFGRIweaK6p9 Eri3B/px1DTk5FHswvicw96rYSJUgunzRjx6AMvgxGjAOOW4aUTbdIm7JtYhzZLR+T15 Q1kA== 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=ryqZmzQSGmj3QyEzEtdGD93VrIXKUKH2O1m7ehKRNJY=; b=x2vx5yhLUtSPDLNUJLGkKQf5EvuRvX/KDAt4MGnODs+L1Vc6QvCz0azL+VRQqcvA1Q xUv2z/vteyqsCDJ5ceGfFcSinjMtzE4/WOfrcCAQ9CVmpUPyveSO2lZu0isSLJ4jBkbw Mud8J11BjSY69/tGcMxVzMEsX4pjzzchE8Tf+DmbNxfcqVcv1bv3EWZQBJMPiWZZpVKI EtiLLpdI5EYQr9UxCYaeHy+7nDIdv01BFxPORGLFfKrTaPqwQXL1QkCgegsspEmXk4XT fwXU2/mCTpHdUovkoRpu0dA5XdjsIlSw3UxeRs+qgakaD1MWqkAT+dp1c0hTYed7M6gC LWUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bnETbwyE; 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 16si19914212ilt.38.2021.06.28.15.51.10; Mon, 28 Jun 2021 15:51:38 -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=bnETbwyE; 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 S236711AbhF1P3A (ORCPT + 99 others); Mon, 28 Jun 2021 11:29:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:39680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235806AbhF1PEQ (ORCPT ); Mon, 28 Jun 2021 11:04:16 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2060061CEC; Mon, 28 Jun 2021 14:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624891395; bh=Ym5mjMMSXYZZW/MwIBUZjxL2HOLzVQWj16e8vUkBWak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnETbwyEnwyPHnw5uFAIScg90T2LZBuNvvdpRHHS8fYRmx6z2b3kJlRLEYq193EXq y8da/42IclK5iJXbLpb60cbYaa6YZH7sUVJFqmRg67R4IQV+DBhS0gnr7zwKLO6cz2 MYmzbXav5+d5LkcGezYVfgq1Gc7ALQnRcEqZzzU+8HXfLGF+Lc9YEn3Agde4zoLpsm JV4XgJ9yVbxPApnQkMbXG0rNva6DvCCCRb6GfE9E8ZVtZXQ+NfdVqJ4AA5ynvolD3B 00Qr2f11ZK1+RU3P8bS69GzX2ZlDPNBNRRDP/83iEz4H99xt0wBMz6EddrnWpEjk7I 0kEvLj8IyghMw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , "David S . Miller" , Sasha Levin Subject: [PATCH 4.4 20/57] qlcnic: Fix an error handling path in 'qlcnic_probe()' Date: Mon, 28 Jun 2021 10:42:19 -0400 Message-Id: <20210628144256.34524-21-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628144256.34524-1-sashal@kernel.org> References: <20210628144256.34524-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.274-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.274-rc1 X-KernelTest-Deadline: 2021-06-30T14:42+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 cb3376604a676e0302258b01893911bdd7aa5278 ] 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: 451724c821c1 ("qlcnic: aer support") Signed-off-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index a4b10776f834..11274b7ea36c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2706,6 +2706,7 @@ err_out_free_hw_res: kfree(ahw); err_out_free_res: + pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); err_out_disable_pdev: -- 2.30.2