remoteproc: imx_dsp_rproc: Fix NULL vs IS_ERR() bug in imx_dsp_rproc_add_carveout()
PATCH 1/1 remoteproc: imx_dsp_rproc: Fix NULL vs IS_ERR() bug in imx_dsp_rproc_add_carveout()
The devm_ioremap_resource_wc() function never returns NULL, it returns error pointers. Update the error checking to match.
Fixes 67a7bc7f0358 ("remoteproc: Use of_reserved_mem_region_* functions for "memory-region"")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/remoteproc/imx_dsp_rproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/imx_dsp_rproc.c +2 -2
@@ -710,9 +710,9 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)return -EINVAL ; cpu_addr =devm_ioremap_resource_wc (dev, &res); -if (!cpu_addr) { +if (IS_ERR (cpu_addr)) {dev_err (dev,"failed to map memory %pR\n" , &res); -return -ENOMEM ; +return PTR_ERR (cpu_addr); }/* Register memory region */
Signature · 1 line
2.51.0
Quoted 5 lines · Dan Carpenter
The
devm_ioremap_resource_wc()function never returns NULL, it returns error pointers. Update the error checking to match.Fixes 67a7bc7f0358 ("remoteproc: Use of_reserved_mem_region_* functions for "memory-region"")Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Iuliana Prodan <[email protected]>
Thanks,
Iulia
Quoted 20 lines
--- drivers/remoteproc/imx_dsp_rproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/remoteproc/imx_dsp_rproc.c +2
-2@@ -710,9 +710,9 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)return -EINVAL ; cpu_addr =devm_ioremap_resource_wc (dev, &res); -if (!cpu_addr) { +if (IS_ERR (cpu_addr)) {dev_err (dev,"failed to map memory %pR\n" , &res); -return -ENOMEM ; +return PTR_ERR (cpu_addr); }/* Register memory region */
Quoted 14 lines · Dan Carpenter
The
devm_ioremap_resource_wc()function never returns NULL, it returns error pointers. Update the error checking to match.Fixes 67a7bc7f0358 ("remoteproc: Use of_reserved_mem_region_* functions for "memory-region"")Signed-off-by Dan Carpenter <[email protected]>--- drivers/remoteproc/imx_dsp_rproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/remoteproc/imx_dsp_rproc.c +0
-0
drivers/remoteproc/imx_dsp_rproc.c static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) · line 715
Quoted 8 lines
drivers/remoteproc/imx_dsp_rproc.c +2
-2@@ -710,9 +710,9 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv)return -EINVAL ; cpu_addr =devm_ioremap_resource_wc (dev, &res); -if (!cpu_addr) { +if (IS_ERR (cpu_addr)) {dev_err (dev,"failed to map memory %pR\n" , &res); -return -ENOMEM ; +return PTR_ERR (cpu_addr);
Applied.
Thanks,
Mathieu
Quoted 6 lines
drivers/remoteproc/imx_dsp_rproc.c +0
-0}/* Register memory region */ Signature · 1 line
2.51.0