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 0ABD1265630; Tue, 8 Apr 2025 10:59:35 +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=1744109975; cv=none; b=ZMQ1W+6TkPdnVaTH20hUelB13qWyDvvc31+GgVVYpUYg4f+qOQSvYt/vky5CibvpLWInURjKuQ8uCbTcAK7c3QtZbiclpLtr58iSOL0pKrHAVtBb1sy+Y5vVcpL/rgykRrqi0h29zOigsaW6MpZZGLMSLtbK7IL4tTpiuoXf6vQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744109975; c=relaxed/simple; bh=zw29dlTDaeQfFZnJjlYohWVfk1jAe09H+0O21vEEfsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qjaqo6rpTisHzjmBocjpwLBPL4D+SJdVpemBJVECpP4qtU/Q1eRvAVmZ7ujOp18UaNg06yAtokhAWZ5/rnJOPxryo6HjH2sM6cXvpslj2DcDLu2UZZr9UTnyQVsgXJ4qJgxEa9k9cQ7+3KLPIkKwXVGzF1GSSMkT5QMjG54gU+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=il2AdxmL; 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="il2AdxmL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E783C4CEE5; Tue, 8 Apr 2025 10:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744109974; bh=zw29dlTDaeQfFZnJjlYohWVfk1jAe09H+0O21vEEfsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=il2AdxmLEqWtXQBkVyyhiZafjblzTuIrF9u0CqT2CuAqiXDAgl2BJxAlU/Fhs9msA bNJt/xIFPeeB0pedVbHA143nGXUm0ybC67LnF4yPK7vIkxABBNYXyH9wXtZmEuPBLq irDMNCQ1C/uDGeXMcwG/m6MFNwoyryc2LwN46CN0= 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 5.10 121/227] EDAC/ie31200: Fix the error path order of ie31200_init() Date: Tue, 8 Apr 2025 12:48:19 +0200 Message-ID: <20250408104823.968293434@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-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 0c894b4890678..cad20e87783b5 100644 --- a/drivers/edac/ie31200_edac.c +++ b/drivers/edac/ie31200_edac.c @@ -608,7 +608,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; @@ -619,11 +619,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"); @@ -631,12 +633,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