Skip to content

Commit

Permalink
remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Bjorn Andersson committed Oct 11, 2017
1 parent ab759b9 commit 68a39a3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/remoteproc/imx_rproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 68a39a3

Please sign in to comment.