[PATCH] i2c: mlxbf: Fix the return check of devm_ioremapm and ioremap

[PATCH] i2c: mlxbf: Fix the return check of devm_ioremapm and ioremap

[Wang Xiaojun]

devm_ioremapm and ioremap may return NULL which cannot be checked
by IS_ERR.

Signed-off-by: Wang Xiaojun <wangxiaojun11@huawei.com>
Reported-by: Hulk Robot <hulkci@huawei.com>
---
 drivers/i2c/busses/i2c-mlxbf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
index 33574d40ea9c..2fb0532d8a16 100644
--- a/drivers/i2c/busses/i2c-mlxbf.c
+++ b/drivers/i2c/busses/i2c-mlxbf.c
@@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct platform_device *pdev,
 		return -EFAULT;
 
 	gpio_res->io = devm_ioremap(dev, params->start, size);
-	if (IS_ERR(gpio_res->io)) {
+	if (!gpio_res->io) {
 		devm_release_mem_region(dev, params->start, size);
-		return PTR_ERR(gpio_res->io);
+		return -ENOMEM;
 	}
 
 	return 0;
@@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct platform_device *pdev,
 		return -EFAULT;
 
 	corepll_res->io = devm_ioremap(dev, params->start, size);
-	if (IS_ERR(corepll_res->io)) {
+	if (!corepll_res->io) {
 		devm_release_mem_region(dev, params->start, size);
-		return PTR_ERR(corepll_res->io);
+		return -ENOMEM;
 	}
 
 	return 0;
@@ -1717,9 +1717,9 @@ static int mlxbf_i2c_init_coalesce(struct platform_device *pdev,
 			return -EFAULT;
 
 		coalesce_res->io = ioremap(params->start, size);
-		if (IS_ERR(coalesce_res->io)) {
+		if (!coalesce_res->io) {
 			release_mem_region(params->start, size);
-			return PTR_ERR(coalesce_res->io);
+			return -ENOMEM;
 		}
 
 		priv->coalesce = coalesce_res;
-- 
2.25.1

RE: [PATCH] i2c: mlxbf: Fix the return check of devm_ioremapm and ioremap

[Khalil Blaiech]

> devm_ioremapm and ioremap may return NULL which cannot be checked
> by IS_ERR.

devm_ioremap

> 
> Signed-off-by: Wang Xiaojun <wangxiaojun11@huawei.com>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> ---
>  drivers/i2c/busses/i2c-mlxbf.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
> index 33574d40ea9c..2fb0532d8a16 100644
> --- a/drivers/i2c/busses/i2c-mlxbf.c
> +++ b/drivers/i2c/busses/i2c-mlxbf.c
> @@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct
> platform_device *pdev,
>  		return -EFAULT;
> 
>  	gpio_res->io = devm_ioremap(dev, params->start, size);
> -	if (IS_ERR(gpio_res->io)) {
> +	if (!gpio_res->io) {
>  		devm_release_mem_region(dev, params->start, size);
> -		return PTR_ERR(gpio_res->io);
> +		return -ENOMEM;
>  	}
> 
>  	return 0;
> @@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct
> platform_device *pdev,
>  		return -EFAULT;
> 
>  	corepll_res->io = devm_ioremap(dev, params->start, size);
> -	if (IS_ERR(corepll_res->io)) {
> +	if (!corepll_res->io) {
>  		devm_release_mem_region(dev, params->start, size);
> -		return PTR_ERR(corepll_res->io);
> +		return -ENOMEM;
>  	}
> 
>  	return 0;
> @@ -1717,9 +1717,9 @@ static int mlxbf_i2c_init_coalesce(struct
> platform_device *pdev,
>  			return -EFAULT;
> 
>  		coalesce_res->io = ioremap(params->start, size);
> -		if (IS_ERR(coalesce_res->io)) {
> +		if (!coalesce_res->io) {
>  			release_mem_region(params->start, size);
> -			return PTR_ERR(coalesce_res->io);
> +			return -ENOMEM;
>  		}
> 
>  		priv->coalesce = coalesce_res;
> --
> 2.25.1

Acked-by: Khalil Blaiech <kblaiech@nvidia.com>

Thanks.

Re: [PATCH] i2c: mlxbf: Fix the return check of devm_ioremapm and ioremap

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

On Wed, Nov 11, 2020 at 11:27:26AM +0800, Wang Xiaojun wrote:
> devm_ioremapm and ioremap may return NULL which cannot be checked
> by IS_ERR.
> 
> Signed-off-by: Wang Xiaojun <wangxiaojun11@huawei.com>
> Reported-by: Hulk Robot <hulkci@huawei.com>

Please fix the typo found by Khalil and resend.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]