net: airoha: Fix a NULL vs IS_ERR() bug in airoha_npu_run_firmware()

[PATCH net-next] net: airoha: Fix a NULL vs IS_ERR() bug in airoha_npu_run_firmware()

Posted by Dan Carpenter 2 months, 3 weeks ago

The devm_ioremap_resource() function returns error pointers.  It never
returns NULL.  Update the check to match.

Fixes: e27dba1951ce ("net: Use of_reserved_mem_region_to_resource{_byname}() for "memory-region"")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 drivers/net/ethernet/airoha/airoha_npu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
index 4e8deb87f751..5b0f66e9cdae 100644
--- a/drivers/net/ethernet/airoha/airoha_npu.c
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
@@ -179,8 +179,8 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
 	}
 
 	addr = devm_ioremap_resource(dev, res);
-	if (!addr) {
-		ret = -ENOMEM;
+	if (IS_ERR(addr)) {
+		ret = PTR_ERR(addr);
 		goto out;
 	}
 
-- 
2.47.2

Re: [PATCH net-next] net: airoha: Fix a NULL vs IS_ERR() bug in airoha_npu_run_firmware()

Posted by Lorenzo Bianconi 2 months, 3 weeks ago

> The devm_ioremap_resource() function returns error pointers.  It never
> returns NULL.  Update the check to match.

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>

> 
> Fixes: e27dba1951ce ("net: Use of_reserved_mem_region_to_resource{_byname}() for "memory-region"")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>  drivers/net/ethernet/airoha/airoha_npu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
> index 4e8deb87f751..5b0f66e9cdae 100644
> --- a/drivers/net/ethernet/airoha/airoha_npu.c
> +++ b/drivers/net/ethernet/airoha/airoha_npu.c
> @@ -179,8 +179,8 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
>  	}
>  
>  	addr = devm_ioremap_resource(dev, res);
> -	if (!addr) {
> -		ret = -ENOMEM;
> +	if (IS_ERR(addr)) {
> +		ret = PTR_ERR(addr);
>  		goto out;
>  	}
>  
> -- 
> 2.47.2
>