[PATCH net-next v3] mfd: pm8008: Fix return value check in pm8008_probe()

[PATCH net-next v3] mfd: pm8008: Fix return value check in pm8008_probe()

[Yang Yingliang]

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

Fixes: 6b149f3310a4 ("mfd: pm8008: Add driver for QCOM PM8008 PMIC")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v3:
  return PTR_ERR(chip->regmap) instead of ENODEV
---
 drivers/mfd/qcom-pm8008.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index c472d7f8103c..fb8915a682ad 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -228,8 +228,8 @@ static int pm8008_probe(struct i2c_client *client)
 
 	chip->dev = &client->dev;
 	chip->regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
-	if (!chip->regmap)
-		return -ENODEV;
+	if (IS_ERR(chip->regmap))
+		return PTR_ERR(chip->regmap);
 
 	i2c_set_clientdata(client, chip);
 
-- 
2.25.1

Re: [PATCH net-next v3] mfd: pm8008: Fix return value check in pm8008_probe()

[Bjorn Andersson]

On Fri 04 Jun 21:24 CDT 2021, Yang Yingliang wrote:

> In case of error, the function devm_regmap_init_i2c() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check
> should be replaced with IS_ERR().
> 
> Fixes: 6b149f3310a4 ("mfd: pm8008: Add driver for QCOM PM8008 PMIC")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---
> v3:
>   return PTR_ERR(chip->regmap) instead of ENODEV
> ---
>  drivers/mfd/qcom-pm8008.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
> index c472d7f8103c..fb8915a682ad 100644
> --- a/drivers/mfd/qcom-pm8008.c
> +++ b/drivers/mfd/qcom-pm8008.c
> @@ -228,8 +228,8 @@ static int pm8008_probe(struct i2c_client *client)
>  
>  	chip->dev = &client->dev;
>  	chip->regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
> -	if (!chip->regmap)
> -		return -ENODEV;
> +	if (IS_ERR(chip->regmap))
> +		return PTR_ERR(chip->regmap);
>  
>  	i2c_set_clientdata(client, chip);
>  
> -- 
> 2.25.1
> 

Re: [PATCH net-next v3] mfd: pm8008: Fix return value check in pm8008_probe()

[Guru Das Srinagesh]

On Sat, Jun 05, 2021 at 10:33:44PM -0500, Bjorn Andersson wrote:
> On Fri 04 Jun 21:24 CDT 2021, Yang Yingliang wrote:
> 
> > In case of error, the function devm_regmap_init_i2c() returns ERR_PTR()
> > and never returns NULL. The NULL test in the return value check
> > should be replaced with IS_ERR().
> > 
> > Fixes: 6b149f3310a4 ("mfd: pm8008: Add driver for QCOM PM8008 PMIC")
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> 
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Acked-by: Guru Das Srinagesh <gurus@codeaurora.org>

> 
> > ---
> > v3:
> >   return PTR_ERR(chip->regmap) instead of ENODEV
> > ---
> >  drivers/mfd/qcom-pm8008.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
> > index c472d7f8103c..fb8915a682ad 100644
> > --- a/drivers/mfd/qcom-pm8008.c
> > +++ b/drivers/mfd/qcom-pm8008.c
> > @@ -228,8 +228,8 @@ static int pm8008_probe(struct i2c_client *client)
> >  
> >  	chip->dev = &client->dev;
> >  	chip->regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
> > -	if (!chip->regmap)
> > -		return -ENODEV;
> > +	if (IS_ERR(chip->regmap))
> > +		return PTR_ERR(chip->regmap);
> >  
> >  	i2c_set_clientdata(client, chip);
> >  
> > -- 
> > 2.25.1
> >