Skip to contentSkip to conversation

power: supply: ab8500_charger: Fix inconsistent IS_ERR and PTR_ERR

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Oct 21, 2019 – Oct 28, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/power/supply/ab8500_charger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/ab8500_charger.c +1 -1
index ff2bb4411a22..8a0f9d769690 100644
@@ -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)) {
Signature · 1 line
2.23.0
#1 lore raw

Hi,

Quoted 9 lines · Gustavo A. R. Silva

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")

---

Thanks, queued.

-- Sebastian

Quoted 19 lines
 drivers/power/supply/ab8500_charger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/ab8500_charger.c +1 -1
index ff2bb4411a22..8a0f9d769690 100644
@@ -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)) {
Signature · 1 line
2.23.0
#2 lore raw

Hey Sebastian,

Quoted 7 lines · Sebastian Reichel

Hi,

Quoted 4 lines · Gustavo A. R. Silva

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

Quoted 8 lines
Quoted 5 lines

This bug was detected with the help of Coccinelle.

Fixes 97ab78bac5d0 ("power: supply: ab8500_charger: Convert to IIO ADC")

---

Thanks, queued.

Awesome.
Thank you!

--
Gustavo