]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
remoteproc: k3: Fix NULL vs IS_ERR() bug in k3_reserved_mem_init()
authorChen Ni <nichen@iscas.ac.cn>
Fri, 27 Feb 2026 09:21:10 +0000 (17:21 +0800)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Thu, 5 Mar 2026 17:22:05 +0000 (10:22 -0700)
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/20260227092110.4044313-1-nichen@iscas.ac.cn
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/remoteproc/ti_k3_common.c

index 32aa954dc5be6787f86e9223bcb5ff66039ce32d..3cb8ae5d72f674db9ee4f7d9ae92a55d67e94827 100644 (file)
@@ -513,7 +513,7 @@ int k3_reserved_mem_init(struct k3_rproc *kproc)
                kproc->rmem[i].dev_addr = (u32)res.start;
                kproc->rmem[i].size = resource_size(&res);
                kproc->rmem[i].cpu_addr = devm_ioremap_resource_wc(dev, &res);
-               if (!kproc->rmem[i].cpu_addr) {
+               if (IS_ERR(kproc->rmem[i].cpu_addr)) {
                        dev_err(dev, "failed to map reserved memory#%d at %pR\n",
                                i + 1, &res);
                        return -ENOMEM;