From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F30BE2690CB; Tue, 8 Apr 2025 11:06:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110364; cv=none; b=J9mePEFy7pg0nqLew4nQGImKjTgYMDsVOVTlYTw4zGx0afpi3Ljsu4GnRfhKhycSsO8q4NvlYggRQRDk1kkPVvvW+xsH+DwWo/hrWz3WCf3jVBjizVHK7xDyT8FRWJG9IKjRULOfQQuogCLJCrKMOy69TGvOfYoFQPLs116MMnQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110364; c=relaxed/simple; bh=8EnOY9V6NNS+Zw3jnbu8CQ1Gkq1aKDf7CKoOGMnvBG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MIBHP0ZTzM2mqVBky7KCntkJ5z+/KX5yiz2nZ+J1KBPMxIqRRW/zTzE8IhxjlqRUepw7fcia9bNVRx9P/ByEZLUr29t1QRGIoaeuKOiFlIAHZAKqUzHV5FmoL50b2r5bgVc02mjpKfdgI18UvVKZz0itDntoZi7DGIpsR59jfJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tHxkqMbV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tHxkqMbV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81C8DC4CEE5; Tue, 8 Apr 2025 11:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744110363; bh=8EnOY9V6NNS+Zw3jnbu8CQ1Gkq1aKDf7CKoOGMnvBG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tHxkqMbVMsT8hUBkPXBltbDb4DvUYLY59oZ+cROUMJRYeJ7J07e57BhceGBORulNz 4FD/Xex64jGl04XWCRf+4mlvSJSHS4ckmPyr3PU+Pm+mwkSRZlMCZf/31ZgmDEcZ4w h1BICEKMlZvHzvlDKiaiHanan/K+XtMXN7J4NzrI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qiuxu Zhuo , Tony Luck , Gary Wang , Sasha Levin Subject: [PATCH 6.14 035/731] EDAC/ie31200: Fix the error path order of ie31200_init() Date: Tue, 8 Apr 2025 12:38:52 +0200 Message-ID: <20250408104915.089772861@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qiuxu Zhuo [ Upstream commit 231e341036d9988447e3b3345cf741a98139199e ] The error path order of ie31200_init() is incorrect, fix it. Fixes: 709ed1bcef12 ("EDAC/ie31200: Fallback if host bridge device is already initialized") Signed-off-by: Qiuxu Zhuo Signed-off-by: Tony Luck Tested-by: Gary Wang Link: https://lore.kernel.org/r/20250310011411.31685-4-qiuxu.zhuo@intel.com Signed-off-by: Sasha Levin --- drivers/edac/ie31200_edac.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/edac/ie31200_edac.c b/drivers/edac/ie31200_edac.c index da4008c22f0d3..9b02a6b43ab58 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -621,7 +621,7 @@ static int __init ie31200_init(void) pci_rc = pci_register_driver(&ie31200_driver); if (pci_rc < 0) - goto fail0; + return pci_rc; if (!mci_pdev) { ie31200_registered = 0; @@ -632,11 +632,13 @@ static int __init ie31200_init(void) if (mci_pdev) break; } + if (!mci_pdev) { edac_dbg(0, "ie31200 pci_get_device fail\n"); pci_rc = -ENODEV; - goto fail1; + goto fail0; } + pci_rc = ie31200_init_one(mci_pdev, &ie31200_pci_tbl[i]); if (pci_rc < 0) { edac_dbg(0, "ie31200 init fail\n"); @@ -644,12 +646,12 @@ static int __init ie31200_init(void) goto fail1; } } - return 0; + return 0; fail1: - pci_unregister_driver(&ie31200_driver); -fail0: pci_dev_put(mci_pdev); +fail0: + pci_unregister_driver(&ie31200_driver); return pci_rc; } -- 2.39.5