* [PATCH -next] remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
@ 2021-03-12 8:04 'Wei Yongjun
2021-03-13 0:08 ` Bjorn Andersson
0 siblings, 1 reply; 2+ messages in thread
From: 'Wei Yongjun @ 2021-03-12 8:04 UTC (permalink / raw)
To: weiyongjun1, Ohad Ben-Cohen, Bjorn Andersson, Mathieu Poirier,
Shawn Guo, Sascha Hauer, Peng Fan
Cc: linux-remoteproc, linux-arm-kernel, kernel-janitors, Hulk Robot
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;
}
priv->mem[b].sys_addr = res.start;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
2021-03-12 8:04 [PATCH -next] remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init() 'Wei Yongjun
@ 2021-03-13 0:08 ` Bjorn Andersson
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Andersson @ 2021-03-13 0:08 UTC (permalink / raw)
To: 'Wei Yongjun
Cc: Ohad Ben-Cohen, Mathieu Poirier, Shawn Guo, Sascha Hauer,
Peng Fan, linux-remoteproc, linux-arm-kernel, kernel-janitors,
Hulk Robot
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;
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-13 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-12 8:04 [PATCH -next] remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init() 'Wei Yongjun
2021-03-13 0:08 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).