remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Fri, 12 Mar 2021 08:04:20 +0000 (08:04 +0000)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Sat, 13 Mar 2021 00:07:19 +0000 (18:07 -0600)
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.

Fixes: ecadcc47492c ("remoteproc: imx_rproc: use devm_ioremap")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20210312080420.277151-1-weiyongjun1@huawei.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/imx_rproc.c

index 5ebb9f5..6d3207c 100644 (file)
@@ -464,10 +464,9 @@ 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(&pdev->dev, res.start, resource_size(&res));
-               if (IS_ERR(priv->mem[b].cpu_addr)) {
+               if (!priv->mem[b].cpu_addr) {
                        dev_err(dev, "failed to remap %pr\n", &res);
-                       err = PTR_ERR(priv->mem[b].cpu_addr);
-                       return err;
+                       return -ENOMEM;
                }
                priv->mem[b].sys_addr = res.start;
                priv->mem[b].size = resource_size(&res);