diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-10-11 12:48:44 +0200 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2017-10-11 19:47:47 +0200 |
| commit | 68a39a3e9fe1d6f0dfe59e3f4d6bc6765e01c903 (patch) | |
| tree | 7fb7aa098a2599935805aaed99aca9bfe7a2a5ad /drivers/remoteproc | |
| parent | remoteproc: qcom: fix RPMSG_QCOM_GLINK_SMEM dependencies (diff) | |
| download | linux-68a39a3e9fe1d6f0dfe59e3f4d6bc6765e01c903.tar.xz linux-68a39a3e9fe1d6f0dfe59e3f4d6bc6765e01c903.zip | |
remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
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>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/imx_rproc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 81ba44510b75..633268e9d550 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -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; |