Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-microblaze.git] / drivers / remoteproc / ti_k3_dsp_remoteproc.c
index 9011e47..863c021 100644 (file)
@@ -445,10 +445,10 @@ static int k3_dsp_rproc_of_get_memories(struct platform_device *pdev,
 
                kproc->mem[i].cpu_addr = devm_ioremap_wc(dev, res->start,
                                                         resource_size(res));
-               if (IS_ERR(kproc->mem[i].cpu_addr)) {
+               if (!kproc->mem[i].cpu_addr) {
                        dev_err(dev, "failed to map %s memory\n",
                                data->mems[i].name);
-                       return PTR_ERR(kproc->mem[i].cpu_addr);
+                       return -ENOMEM;
                }
                kproc->mem[i].bus_addr = res->start;
                kproc->mem[i].dev_addr = data->mems[i].dev_addr;