2021-05-19 19:57:33

by Wei Yongjun

Subject: [PATCH -next] reset: mchp: sparx5: fix return value check in mchp_sparx5_map_io()

In case of error, the function devm_platform_get_and_ioremap_resource()
returns ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().

Fixes: 453ed4283beb ("reset: mchp: sparx5: add switch reset driver")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/reset/reset-microchip-sparx5.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c
index cff39a643a14..f01e7db8e83b 100644
--- a/drivers/reset/reset-microchip-sparx5.c
+++ b/drivers/reset/reset-microchip-sparx5.c
@@ -82,9 +82,9 @@ static int mchp_sparx5_map_io(struct platform_device *pdev, int index,
void __iomem *mem;

mem = devm_platform_get_and_ioremap_resource(pdev, index, &res);
- if (!mem) {
+ if (IS_ERR(mem)) {
dev_err(&pdev->dev, "Could not map resource %d\n", index);
- return -ENXIO;
+ return PTR_ERR(mem);
}
sparx5_reset_regmap_config.name = res->name;
map = devm_regmap_init_mmio(&pdev->dev, mem, &sparx5_reset_regmap_config);

2021-06-07 09:27:21

by Philipp Zabel

Subject: Re: [PATCH -next] reset: mchp: sparx5: fix return value check in mchp_sparx5_map_io()

On Wed, 2021-05-19 at 14:16 +0000, Wei Yongjun wrote:
> In case of error, the function devm_platform_get_and_ioremap_resource()
> returns ERR_PTR() and never returns NULL. The NULL test in the return
> value check should be replaced with IS_ERR().
>
> Fixes: 453ed4283beb ("reset: mchp: sparx5: add switch reset driver")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>

Thank you, applied to reset/fixes.

regards
Philipp

2021-06-07 09:36:55

by Philipp Zabel

Subject: Re: [PATCH -next] reset: mchp: sparx5: fix return value check in mchp_sparx5_map_io()

On Mon, 2021-06-07 at 11:23 +0200, Philipp Zabel wrote:
> On Wed, 2021-05-19 at 14:16 +0000, Wei Yongjun wrote:
> > In case of error, the function devm_platform_get_and_ioremap_resource()
> > returns ERR_PTR() and never returns NULL. The NULL test in the return
> > value check should be replaced with IS_ERR().
> >
> > Fixes: 453ed4283beb ("reset: mchp: sparx5: add switch reset driver")
> > Reported-by: Hulk Robot <[email protected]>
> > Signed-off-by: Wei Yongjun <[email protected]>
>
> Thank you, applied to reset/fixes.
^^^^^^^^^^^
reset/next, not fixes.

regards
Philipp