From: Davidlohr Bueso <dave@stgolabs.net>
Date: Fri, 15 Nov 2024 17:00:32 +0000 (-0800)
Subject: cxl/pci: Fix potential bogus return value upon successful probing
X-Git-Tag: v6.13-rc4~30^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da4d8c83358163df9a4addaeba0ef8bcb03b22e8;p=thirdparty%2Fkernel%2Flinux.git

cxl/pci: Fix potential bogus return value upon successful probing

If cxl_pci_ras_unmask() returns non-zero, cxl_pci_probe() will end up
returning that value, instead of zero.

Fixes: 248529edc86f ("cxl: add RAS status unmasking for CXL")
Reviewed-by: Fan Ni <fan.ni@samsung.com>
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Link: https://patch.msgid.link/20241115170032.108445-1-dave@stgolabs.net
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---

diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 0241d1d7133a4..26ab06c9deffb 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -1032,8 +1032,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (rc)
 		return rc;
 
-	rc = cxl_pci_ras_unmask(pdev);
-	if (rc)
+	if (cxl_pci_ras_unmask(pdev))
 		dev_dbg(&pdev->dev, "No RAS reporting unmasked\n");
 
 	pci_save_state(pdev);