Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3837898pxv; Mon, 28 Jun 2021 14:18:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDgdfhNP6DzrTU3mAYK1/7BnskQ+nHVIhD8KvKeUdB9q1BNRxhUEK90lplY6iT8p/jsCo1 X-Received: by 2002:a92:3f01:: with SMTP id m1mr20545891ila.122.1624915095661; Mon, 28 Jun 2021 14:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624915095; cv=none; d=google.com; s=arc-20160816; b=cW0u5zS4C60aKryQ8Gh0b4hzvP3HoK8SchOyVkf2UuEqsPuiSJRl1E9led1R4IIjuL QKeXiu3VHay+qu2ZDdN9ADHYgrhu5wUDLZayAb3ThGH4KLPXKv29J2dlXNWa5nLZoo6r yVT2MF4W4GYenINDEwWHhIEsFhJKOliSbbMpwDG3MJAa3Pk1d2mGIEU4eVvmJOuITXyp wX7FPK6bmYTZR9RNN/n+kA7WmcxnDY+pLnIfLep7cnpf7YxfSwb0+wUoh4zvK208zZ8e +JJMLOXleGa3+5vEm1R7VQyb0Bm05U4pEMbqzBnwqxhMaW1Mq7ZDLzQA96uDgy+PZzrP +eLQ== 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=XzJsoAmVXAx5TnL51w07Y3to2zO4udzXGB8+SmhVdvY=; b=sLCncD0AjuBCYtxmK9O3Uc8Hl1WxKGXElMLu288v8V5D9nJBofCDvpm5/Y3aX2+R+g K0pN2oKFqBa63Hf7TyJt1rHs9GLDyB/Yfv9+gHiQA0yDDwvIBiPEaALLPsoDO7tjHW+C 1KJyMPV336hdOLgwWWsuPuomD2mYCVXISJFdPu9h/zQsTJqHlfZHemqps9SjzBfMXRjq XjuwYRLrdVBH7wO98cEgWtUErY8n0Ne9AJWOD/VkGO7rlnMpSbywZ/EYr2Y23UdFG8qi ehQ1ZWTp4Dpgf+2J1iH3dv7vXAqTd7bSBSZOurCU7p/cUt/Fz01T0Lk0LSjSz0bu4oXn kb+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rFkqHcPD; 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 r7si20530133ilg.41.2021.06.28.14.17.59; Mon, 28 Jun 2021 14:18:15 -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=rFkqHcPD; 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 S238258AbhF1PUs (ORCPT + 99 others); Mon, 28 Jun 2021 11:20:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:36470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235234AbhF1O62 (ORCPT ); Mon, 28 Jun 2021 10:58:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D37E61D0E; Mon, 28 Jun 2021 14:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624891228; bh=SRGoeeBhRJlJDujcd418Ov2WR4Du2B9Ixo5AdG4KcKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFkqHcPDNtuTA5vCDQNOH1Sx5RwaCLlfEaeVb0uwAHWWWKvD02xHsQXMEr0dAP0dP wAFPoRbPq4smJQlPBstx/IXVxn+U/JcyZKvLKKhTb/cpsofPMkwprJ1enl7pGB3dqu Ai7X4DGr/xaMIQGR6IIPHlZynMaC2Gu0pMjBBln5PIxpT+2+vSkv6XelSPrYt+/u00 4aUR0gr2qtKmS4usSeHX9pZysbyRHXePsxaFnaHdF8lf4ByKhUQs0dX41v1BHTL5SA lRYSRnHXCHMMbd7eXOu+n0+9xvlCx/MP9Ec1BR2bK3H0P9GbT54JYbn+INxgckSFx9 1sfMEc1F196iw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , "David S . Miller" , Sasha Levin Subject: [PATCH 4.9 26/71] qlcnic: Fix an error handling path in 'qlcnic_probe()' Date: Mon, 28 Jun 2021 10:39:18 -0400 Message-Id: <20210628144003.34260-27-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628144003.34260-1-sashal@kernel.org> References: <20210628144003.34260-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.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.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.274-rc1 X-KernelTest-Deadline: 2021-06-30T14:39+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 0928da21efd0..19dca845042e 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2707,6 +2707,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