OSDN Git Service

remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 11 Oct 2017 10:48:44 +0000 (10:48 +0000)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Wed, 11 Oct 2017 17:47:47 +0000 (10:47 -0700)
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.

Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
drivers/remoteproc/imx_rproc.c

index 81ba445..633268e 100644 (file)
@@ -269,10 +269,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 
                priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev,
                                                     att->sa, att->size);
-               if (IS_ERR(priv->mem[b].cpu_addr)) {
+               if (!priv->mem[b].cpu_addr) {
                        dev_err(dev, "devm_ioremap_resource failed\n");
-                       err = PTR_ERR(priv->mem[b].cpu_addr);
-                       return err;
+                       return -ENOMEM;
                }
                priv->mem[b].sys_addr = att->sa;
                priv->mem[b].size = att->size;