]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
remoteproc: imx_rproc: Fix NULL vs IS_ERR() bug in imx_rproc_addr_init()
authorChen Ni <nichen@iscas.ac.cn>
Fri, 27 Feb 2026 09:15:46 +0000 (17:15 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 May 2026 13:31:16 +0000 (15:31 +0200)
commit 665eebebb029690a5b2f92e481020877cc6c8d36 upstream.

The devm_ioremap_resource_wc() function never returns NULL, it returns
error pointers.  Update the error checking to match.

Fixes: 67a7bc7f0358 ("remoteproc: Use of_reserved_mem_region_* functions for "memory-region"")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20260227091546.4044246-1-nichen@iscas.ac.cn
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/remoteproc/imx_rproc.c

index 8c8ddbf995a46b01627d15a2eb3da0b72eee6285..23126bc2270593bbe31afd7f24a12c4e4722e133 100644 (file)
@@ -812,7 +812,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 
                /* Not use resource version, because we might share region */
                priv->mem[b].cpu_addr = devm_ioremap_resource_wc(&pdev->dev, &res);
-               if (!priv->mem[b].cpu_addr) {
+               if (IS_ERR(priv->mem[b].cpu_addr)) {
                        dev_err(dev, "failed to remap %pr\n", &res);
                        return -ENOMEM;
                }