power: supply: check if calc_soc succeeded in pm860x_init_battery

[ Upstream commit ccf193dee1f0fff55b556928591f7818bac1b3b1 ]

clang static analysis flags this error

88pm860x_battery.c:522:19: warning: Assigned value is
  garbage or undefined [core.uninitialized.Assign]
                info->start_soc = soc;
                                ^ ~~~
soc is set by calling calc_soc.
But calc_soc can return without setting soc.

So check the return status and bail similarly to other
checks in pm860x_init_battery and initialize soc to
silence the warning.

Fixes: a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x")
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/power/88pm860x_battery.c b/drivers/power/88pm860x_battery.c
index 63c57dc82ac1d5845c4f256376cac5fdee26ef04..4eda5065b5bbc90dca0bb2cb2793dc0417b19980 100644 (file)
--- a/drivers/power/88pm860x_battery.c
+++ b/drivers/power/88pm860x_battery.c
@@ -436,7 +436,7 @@ static void pm860x_init_battery(struct pm860x_battery_info *info)
        int ret;
        int data;
        int bat_remove;
-       int soc;
+       int soc = 0;
 
        /* measure enable on GPADC1 */
        data = MEAS1_GP1;
@@ -499,7 +499,9 @@ static void pm860x_init_battery(struct pm860x_battery_info *info)
        }
        mutex_unlock(&info->lock);
 
-       calc_soc(info, OCV_MODE_ACTIVE, &soc);
+       ret = calc_soc(info, OCV_MODE_ACTIVE, &soc);
+       if (ret < 0)
+               goto out;
 
        data = pm860x_reg_read(info->i2c, PM8607_POWER_UP_LOG);
        bat_remove = data & BAT_WU_LOG;