iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()

Browse Source 
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: ecadcc4749 ("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>
This commit is contained in:
Wei Yongjun 2021-03-12 08:04:20 +00:00 committed by Bjorn Andersson
parent 2df7062002
commit 18cda8018a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/remoteproc/imx_rproc.c
View File

@ -464,10 +464,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
/* Not use resource version, because we might share region */ /* Not use resource version, because we might share region */
priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, res.start, resource_size(&res)); 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); dev_err(dev, "failed to remap %pr\n", &res);
err = PTR_ERR(priv->mem[b].cpu_addr); return -ENOMEM;
return err;
} }
priv->mem[b].sys_addr = res.start; priv->mem[b].sys_addr = res.start;
priv->mem[b].size = resource_size(&res); priv->mem[b].size = resource_size(&res);