power: supply: check if calc_soc succeeded in pm860x_init_battery
Subsystems (2)
PATCH 1/1 power: supply: check if calc_soc succeeded in pm860x_init_battery
From: Tom Rix <[email protected]>
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.
--- drivers/power/supply/88pm860x_battery.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/power/supply/88pm860x_battery.c +4 -2
@@ -433,7 +433,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 ;
@@ -496,7 +496,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 ;
Signature · 1 line
2.18.1
Sebastian Reichel
maintainerHi,
Quoted 11 lines · On Sun, Jul 12, 2020 at 12:23:51PM -0700, [email protected] wrote:
From: Tom Rix <[email protected]>
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.
Butcalc_soccan return without setting soc.
Quoted 8 lines
So check the return status and bail similarly to other checks in
pm860x_init_batteryand initialize soc to silence the warning.Fixes a830d28b48bf ("power_supply: Enable battery-charger for 88pm860x")Signed-off-by Tom Rix <[email protected]>---
Thanks, queued.
-- Sebastian
Quoted 30 lines
drivers/power/supply/88pm860x_battery.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/power/supply/88pm860x_battery.c +4
-2@@ -433,7 +433,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 ;@@ -496,7 +496,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 ;Signature · 1 line
2.18.1