| Message ID | 20210312080420.277151-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init() | expand |
On Fri 12 Mar 02:04 CST 2021, 'Wei Yongjun wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > 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: ecadcc47492c ("remoteproc: imx_rproc: use devm_ioremap") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/remoteproc/imx_rproc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 5ebb9f57d3e0..3ba4b6ba47aa 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -464,9 +464,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, > > /* Not use resource version, because we might share region */ > 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); > - err = PTR_ERR(priv->mem[b].cpu_addr); > + err = -ENOMEM; > return err; Took the liberty of changing this to return -ENOMEM, as I applied the patch. Thank you, Bjorn > } > priv->mem[b].sys_addr = res.start; >
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 5ebb9f57d3e0..3ba4b6ba47aa 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -464,9 +464,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, /* Not use resource version, because we might share region */ 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); - err = PTR_ERR(priv->mem[b].cpu_addr); + err = -ENOMEM; return err; } priv->mem[b].sys_addr = res.start;