Commit 05599b5f authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

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: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parents b150a703 f3766911

drivers/power/supply/cw2015_battery.c

+1 −1
Original line number Diff line number Diff line
@@ -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;