Commit 68a39a3e authored Oct 11, 2017 by Wei Yongjun Committed by Bjorn Andersson Oct 11, 2017

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>

parent ab759b97

drivers/remoteproc/imx_rproc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;