power: ip5xxx_power: Fix return value on ADC read errors

If ADC read returns an error, the return value was silently ignored,
execution continued and an uninitialized value and a return code of 0
was passed back to userspace. The only exception was
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, which bailed out correctly.
Fix returns for the other cases as well.

Fixes: 75853406fa27 ("power: supply: Add a driver for Injoinic power bank ICs")
Signed-off-by: Csókás, Bence <csokas.bence@prolan.hu>
Link: https://lore.kernel.org/r/20241119180741.2237692-2-csokas.bence@prolan.hu
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/ip5xxx_power.c b/drivers/power/supply/ip5xxx_power.c
index 82263646ddc61f00794081f3fd1e63cee923a6a6..07ad263e8e153030c07df2a17cc2261a41bb2872 100644 (file)
--- a/drivers/power/supply/ip5xxx_power.c
+++ b/drivers/power/supply/ip5xxx_power.c
@@ -337,6 +337,8 @@ static int ip5xxx_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
                ret = ip5xxx_battery_read_adc(ip5xxx, IP5XXX_BATVADC_DAT0,
                                              IP5XXX_BATVADC_DAT1, &raw);
+               if (ret)
+                       return ret;
 
                val->intval = 2600000 + DIV_ROUND_CLOSEST(raw * 26855, 100);
                return 0;
@@ -344,6 +346,8 @@ static int ip5xxx_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_VOLTAGE_OCV:
                ret = ip5xxx_battery_read_adc(ip5xxx, IP5XXX_BATOCV_DAT0,
                                              IP5XXX_BATOCV_DAT1, &raw);
+               if (ret)
+                       return ret;
 
                val->intval = 2600000 + DIV_ROUND_CLOSEST(raw * 26855, 100);
                return 0;
@@ -351,6 +355,8 @@ static int ip5xxx_battery_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_CURRENT_NOW:
                ret = ip5xxx_battery_read_adc(ip5xxx, IP5XXX_BATIADC_DAT0,
                                              IP5XXX_BATIADC_DAT1, &raw);
+               if (ret)
+                       return ret;
 
                val->intval = DIV_ROUND_CLOSEST(raw * 149197, 200);
                return 0;