2021-09-09 09:01:47

by Yang Yingliang

Subject: [PATCH] n64cart: fix return value check in n64cart_probe()

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

Fixes: d9b2a2bbbb4d ("block: Add n64 cart driver")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/block/n64cart.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c
index c84be0028f63..26798da661bd 100644
--- a/drivers/block/n64cart.c
+++ b/drivers/block/n64cart.c
@@ -129,8 +129,8 @@ static int __init n64cart_probe(struct platform_device *pdev)
}

reg_base = devm_platform_ioremap_resource(pdev, 0);
- if (!reg_base)
- return -EINVAL;
+ if (IS_ERR(reg_base))
+ return PTR_ERR(reg_base);

disk = blk_alloc_disk(NUMA_NO_NODE);
if (!disk)
--
2.25.1

2021-09-09 16:19:02

by Chaitanya Kulkarni

Subject: Re: [PATCH] n64cart: fix return value check in n64cart_probe()

On 9/9/21 2:06 AM, Yang Yingliang wrote:
> External email: Use caution opening links or attachments
>
>
> In case of error, the function devm_platform_ioremap_resource()
> returns ERR_PTR() and never returns NULL. The NULL test in the
> return value check should be replaced with IS_ERR().
>
> Fixes: d9b2a2bbbb4d ("block: Add n64 cart driver")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>

Looks good.

Reviewed-by: Chaitanya Kulkarni <[email protected]>

2021-09-09 20:27:57

by Jens Axboe

Subject: Re: [PATCH] n64cart: fix return value check in n64cart_probe()

On 9/9/21 3:06 AM, Yang Yingliang wrote:
> In case of error, the function devm_platform_ioremap_resource()
> returns ERR_PTR() and never returns NULL. The NULL test in the
> return value check should be replaced with IS_ERR().

Applied, thanks.

--
Jens Axboe