]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cxl/pci: Fix potential bogus return value upon successful probing
authorDavidlohr Bueso <dave@stgolabs.net>
Fri, 15 Nov 2024 17:00:32 +0000 (09:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Dec 2024 13:02:01 +0000 (14:02 +0100)
[ Upstream commit da4d8c83358163df9a4addaeba0ef8bcb03b22e8 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/cxl/pci.c

index 188412d45e0d266b19f7401a1cdc51ed6fb0ea0a..6e553b5752b1dd1856ffdd835c4d718708b51421 100644 (file)
@@ -942,8 +942,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);