Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3594955pxv; Mon, 28 Jun 2021 08:11:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3yFmZ2N6uz5triCC9nEclWdAVViK/c2f6NxUUjdcWHj4HP3d94MN9/hI+so85Pc+f85Xz X-Received: by 2002:a17:906:2608:: with SMTP id h8mr24297751ejc.380.1624893102660; Mon, 28 Jun 2021 08:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624893102; cv=none; d=google.com; s=arc-20160816; b=Nd67VLVAw0v/vwwfW8h76tdJ8UCjTDOpzuoyhzYgv7puyvzaZsPuXLQmB5FRjv/zau 1M7J9L5jWZlxNoYN6YkWtHOC3MgsdvSmwQnJ7tpjR7flvfJS6WflpsjSohbITB75MYkx 0vcy3qwqlQiGNDHOWMRHKbKLB+MNqOdMPRGjsyGO64DqJeRyqrtPQjbAT5XPCWht75yN pqgeg6Qd/Be9q4Fh/SqBFdyJf4/cd1yn5G0sU4uBIrOW7Pu9jUajDZzTwzhY6I6J8AAO XrktethMCxPVvqmB/Z2NxdLqGC59/GRuG/4+8WIQvDthhHYis8feVFpkbmPoanUCtQQj /FLQ== 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=YrLr/yqW3P5iBmvT0U+dGpw/GYDmuVXYfgVzOtkKpNM=; b=dMLVrR32ZqBMMBy3r77dg9sboi9IfVoMUDj/mVao0Sx1P5CcVnYn8WyEPHi0uqTyK3 g0RMrAkv4RZ3yx27lkYedLxgTE+i7/F1rAsBPMEUl0EC5F6DLqYvXpjORGBPE42EEEqu yeGIpuzcynvXQDzckE6ZXk1axoIf8XU8n8aMZADkGC3F8m9Y/rANhgRdXU3n6wxdDc0l bbe1vrMXA909YWoI+NPHPxPUX90mJIXs2NfDOPmFiKev86r0LfFlslIU0wYP+wKuREHV h25xmp2T+4oHwqPCpVZ4VtL9426d26rpyvMRARx7DCSSbrPpHvpzBMowL0DLTvnEMI+a fE2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bjOtGKCt; 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 p2si15118372edu.249.2021.06.28.08.11.15; Mon, 28 Jun 2021 08:11:42 -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=bjOtGKCt; 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 S237729AbhF1PKO (ORCPT + 99 others); Mon, 28 Jun 2021 11:10:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:54534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236462AbhF1OtX (ORCPT ); Mon, 28 Jun 2021 10:49:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9B88561D24; Mon, 28 Jun 2021 14:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624891017; bh=nAqVMz/Q0ieuVcn88c+qsvpkAbdQ8SUFXA9pBZGGx7A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bjOtGKCtmnCyf7olFo553XLsn6KJbPcJbDOr3lIc1H2fHtNpqIF3c6gWLEmwab6P6 xkEaNaAxCXOFA6xGyMLr99awl/oFMbIfOO0AfTqKvuxclijIE6orEPsu/LQ/a+NOnH UUsR56lFjhKX/RXXB77k2jeFqNqrcWi2mQoYEeCMaIyu3E6ui71aC7ug9hzxq+o9RR hgqju84/PhS66qXjELx12z2yK7frHZiM6qt1WPeYrgtgALWdD55B5o03KkkK6TXALj ujDHJFtzgvINBYR1/JauGlk9L5bI0h1dbPaBUO8CgiM2Z/JZz6eDM29r+/38SpLGjW XMb1Jtp2ed+Uw== 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 30/88] qlcnic: Fix an error handling path in 'qlcnic_probe()' Date: Mon, 28 Jun 2021 10:35:30 -0400 Message-Id: <20210628143628.33342-31-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 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 6684a4cb8b88..45361310eea0 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2711,6 +2711,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) kfree(ahw); err_out_free_res: + pci_disable_pcie_error_reporting(pdev); pci_release_regions(pdev); err_out_disable_pdev: -- 2.30.2