firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe

[PATCH] firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe

Posted by Dan Carpenter 2 years, 8 months ago

The svc_create_memory_pool() function returns error pointers.  It never
returns NULL.  Fix the check.

Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/firmware/stratix10-svc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index bde1f543f529..80f4e2d14e04 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1133,8 +1133,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
 		return ret;
 
 	genpool = svc_create_memory_pool(pdev, sh_memory);
-	if (!genpool)
-		return -ENOMEM;
+	if (IS_ERR(genpool))
+		return PTR_ERR(genpool);
 
 	/* allocate service controller and supporting channel */
 	controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);
-- 
2.39.2

Re: [PATCH] firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe

Posted by Dinh Nguyen 2 years, 7 months ago


On 4/19/23 09:27, Dan Carpenter wrote:
> The svc_create_memory_pool() function returns error pointers.  It never
> returns NULL.  Fix the check.
> 
> Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>   drivers/firmware/stratix10-svc.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index bde1f543f529..80f4e2d14e04 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -1133,8 +1133,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
>   		return ret;
>   
>   	genpool = svc_create_memory_pool(pdev, sh_memory);
> -	if (!genpool)
> -		return -ENOMEM;
> +	if (IS_ERR(genpool))
> +		return PTR_ERR(genpool);
>   
>   	/* allocate service controller and supporting channel */
>   	controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);

Acked-by: Dinh Nguyen <dinguyen@kernel.org>