]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: xilinx: xdma: Fix regmap init error handling
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Tue, 14 Oct 2025 06:13:08 +0000 (08:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Apr 2026 11:25:54 +0000 (13:25 +0200)
[ Upstream commit e0adbf74e2a0455a6bc9628726ba87bcd0b42bf8 ]

devm_regmap_init_mmio returns an ERR_PTR() upon error, not NULL.
Fix the error check and also fix the error message. Use the error code
from ERR_PTR() instead of the wrong value in ret.

Fixes: 17ce252266c7 ("dmaengine: xilinx: xdma: Add xilinx xdma driver")
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20251014061309.283468-1-alexander.stein@ew.tq-group.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/xilinx/xdma.c

index 5ecf8223c112e468c79ce635398ba393a535b9e0..58e01e22b9765bb0b805f3de846ee724d8e13a54 100644 (file)
@@ -1236,8 +1236,8 @@ static int xdma_probe(struct platform_device *pdev)
 
        xdev->rmap = devm_regmap_init_mmio(&pdev->dev, reg_base,
                                           &xdma_regmap_config);
-       if (!xdev->rmap) {
-               xdma_err(xdev, "config regmap failed: %d", ret);
+       if (IS_ERR(xdev->rmap)) {
+               xdma_err(xdev, "config regmap failed: %pe", xdev->rmap);
                goto failed;
        }
        INIT_LIST_HEAD(&xdev->dma_dev.channels);