diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-08 11:39:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-08 11:39:53 -0800 |
| commit | d445d649c7929ddafff319ad90e3e190722c685a (patch) | |
| tree | a2ae5e4a92310a891bb6e8d08191246f6ddd033d /drivers/power/supply/power_supply_core.c | |
| parent | 622e42a674641214034001767334893e2afaeba8 (diff) | |
| parent | 644106cdb89844be2496b21175b7c0c2e0fab381 (diff) | |
Merge tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fixes from Sebastian Reichel:
"Three fixes for the 5.16 cycle:
- Avoid going beyond last capacity in the power-supply core
- Replace 1E6L with NSEC_PER_MSEC to avoid floating point calculation
in LLVM resulting in a build failure
- Fix ADC measurements in bq25890 charger driver"
* tag 'for-v5.16-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: reset: ltc2952: Fix use of floating point literals
power: bq25890: Enable continuous conversion for ADC at charging
power: supply: core: Break capacity loop
Diffstat (limited to 'drivers/power/supply/power_supply_core.c')
| -rw-r--r-- | drivers/power/supply/power_supply_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index fc12a4f407f4..6093754cebd5 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -853,6 +853,10 @@ power_supply_find_ocv2cap_table(struct power_supply_battery_info *info, return NULL; for (i = 0; i < POWER_SUPPLY_OCV_TEMP_MAX; i++) { + /* Out of capacity tables */ + if (!info->ocv_table[i]) + break; + temp_diff = abs(info->ocv_temp[i] - temp); if (temp_diff < best_temp_diff) { |