mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
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>
This commit is contained in:
commit
05599b5f56
@ -491,7 +491,7 @@ static int cw_battery_get_property(struct power_supply *psy,
|
|||||||
|
|
||||||
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
|
case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
|
||||||
if (cw_battery_valid_time_to_empty(cw_bat))
|
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
|
else
|
||||||
val->intval = 0;
|
val->intval = 0;
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user