diff options
| author |   Sebastian Reichel <sebastian.reichel@collabora.com> | 2024-01-14 21:38:31 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2024-01-14 21:38:31 +0100 |
| commit | 05599b5f56b750b5a92ff7f2c081945210816f83 (patch) | |
| tree | 26cb2b3776df083587bfc8b1065b9959e22d63bc /drivers/power/supply | |
| parent | power: supply: bq24190_charger: Add support for BQ24296 (diff) | |
| parent | power: supply: cw2015: correct time_to_empty units in sysfs (diff) | |
| download | wireguard-linux-05599b5f56b750b5a92ff7f2c081945210816f83.tar.xz wireguard-linux-05599b5f56b750b5a92ff7f2c081945210816f83.zip | |
Merge power-supply fixes for 6.7 cycle
Merge power-supply fixes branch, which I never send for
the v6.7 cycle.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply')
| -rw-r--r-- | drivers/power/supply/cw2015_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/cw2015_battery.c b/drivers/power/supply/cw2015_battery.c index bb29e9ebd24a..99f3ccdc30a6 100644 --- a/drivers/power/supply/cw2015_battery.c +++ b/drivers/power/supply/cw2015_battery.c @@ -491,7 +491,7 @@ static int cw_battery_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW: if (cw_battery_valid_time_to_empty(cw_bat)) - val->intval = cw_bat->time_to_empty; + val->intval = cw_bat->time_to_empty * 60; else val->intval = 0; break; |