Skip to content

Commit 6151967

Browse files
Chen Nigregkh
authored andcommitted
remoteproc: k3: Fix NULL vs IS_ERR() bug in k3_reserved_mem_init()
commit 5b1f4b5 upstream. The devm_ioremap_resource_wc() function never returns NULL, it returns error pointers. Update the error checking to match. Fixes: 67a7bc7 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cc2fd63 commit 6151967

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/remoteproc/ti_k3_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ int k3_reserved_mem_init(struct k3_rproc *kproc)
513513
kproc->rmem[i].dev_addr = (u32)res.start;
514514
kproc->rmem[i].size = resource_size(&res);
515515
kproc->rmem[i].cpu_addr = devm_ioremap_resource_wc(dev, &res);
516-
if (!kproc->rmem[i].cpu_addr) {
516+
if (IS_ERR(kproc->rmem[i].cpu_addr)) {
517517
dev_err(dev, "failed to map reserved memory#%d at %pR\n",
518518
i + 1, &res);
519519
return -ENOMEM;

0 commit comments

Comments
 (0)