2019-10-21 18:14:30

by Gustavo A. R. Silva

[permalink] [raw]

Subject: [PATCH] power: supply: ab8500_charger: Fix inconsistent IS_ERR and PTR_ERR

---

Fix inconsistent IS_ERR and PTR_ERR in ab8500_charger_probe().

The proper pointer to be passed as argument is di->adc_main_charger_c

This bug was detected with the help of Coccinelle.

Fixes: 97ab78bac5d0 ("power: supply: ab8500_charger: Convert to IIO ADC")
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/power/supply/ab8500_charger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index ff2bb4411a22..8a0f9d769690 100644
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -3393,7 +3393,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
if (PTR_ERR(di->adc_main_charger_c) == -ENODEV)
return -EPROBE_DEFER;
dev_err(&pdev->dev, "failed to get ADC main charger current\n");
- return PTR_ERR(di->adc_main_charger_v);
+ return PTR_ERR(di->adc_main_charger_c);
}
di->adc_vbus_v = devm_iio_channel_get(&pdev->dev, "vbus_v");
if (IS_ERR(di->adc_vbus_v)) {
--
2.23.0

2019-10-27 21:34:21

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH] power: supply: ab8500_charger: Fix inconsistent IS_ERR and PTR_ERR

---

Hi,

On Mon, Oct 21, 2019 at 12:49:37PM -0500, Gustavo A. R. Silva wrote:
> Fix inconsistent IS_ERR and PTR_ERR in ab8500_charger_probe().
>
> The proper pointer to be passed as argument is di->adc_main_charger_c
>
> This bug was detected with the help of Coccinelle.
>
> Fixes: 97ab78bac5d0 ("power: supply: ab8500_charger: Convert to IIO ADC")
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---

Thanks, queued.

-- Sebastian

> drivers/power/supply/ab8500_charger.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
> index ff2bb4411a22..8a0f9d769690 100644
> --- a/drivers/power/supply/ab8500_charger.c
> +++ b/drivers/power/supply/ab8500_charger.c
> @@ -3393,7 +3393,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
> if (PTR_ERR(di->adc_main_charger_c) == -ENODEV)
> return -EPROBE_DEFER;
> dev_err(&pdev->dev, "failed to get ADC main charger current\n");
> - return PTR_ERR(di->adc_main_charger_v);
> + return PTR_ERR(di->adc_main_charger_c);
> }
> di->adc_vbus_v = devm_iio_channel_get(&pdev->dev, "vbus_v");
> if (IS_ERR(di->adc_vbus_v)) {
> --
> 2.23.0
>

---

Attachments:

(No filename) (1.23 kB)
signature.asc (849.00 B)
Download all attachments

2019-10-29 06:52:26

by Gustavo A. R. Silva

[permalink] [raw]

Subject: Re: [PATCH] power: supply: ab8500_charger: Fix inconsistent IS_ERR and PTR_ERR

---

Hey Sebastian,

On 10/27/19 16:30, Sebastian Reichel wrote:
> Hi,
>
> On Mon, Oct 21, 2019 at 12:49:37PM -0500, Gustavo A. R. Silva wrote:
>> Fix inconsistent IS_ERR and PTR_ERR in ab8500_charger_probe().
>>
>> The proper pointer to be passed as argument is di->adc_main_charger_c
>>
>> This bug was detected with the help of Coccinelle.
>>
>> Fixes: 97ab78bac5d0 ("power: supply: ab8500_charger: Convert to IIO ADC")
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>> ---
>
> Thanks, queued.
>

Awesome.
Thank you!

--
Gustavo