remoteproc: k3-dsp: Fix return value check in k3_dsp_rproc_of_get_memories()

[ Upstream commit 6dfdf6e4e7096fead7755d47d91d72e896bb4804 ]

In case of error, the function devm_ioremap_wc() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.

Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixes: 6edbe024ba17 ("remoteproc: k3-dsp: Add a remoteproc driver of K3 C66x DSPs")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Suman Anna <s-anna@ti.com>
Link: https://lore.kernel.org/r/20200905122503.17352-1-yuehaibing@huawei.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
index 9011e47..863c021 100644 (file)
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -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;