Commit e4108292 authored by Lan Tianyu's avatar Lan Tianyu Committed by Len Brown
Browse files

ACPI / SBS: Correct the value of power_now and power_avg in the sysfs 

https://bugzilla.kernel.org/show_bug.cgi?id=24492



Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1dd5c715

drivers/acpi/sbs.c

+6 −0
Original line number Diff line number Diff line
@@ -230,11 +230,17 @@ static int acpi_sbs_battery_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_POWER_NOW:

		val->intval = abs(battery->rate_now) *

				acpi_battery_ipscale(battery) * 1000;

		val->intval *= (acpi_battery_mode(battery)) ?

				(battery->voltage_now *

				acpi_battery_vscale(battery) / 1000) : 1;

		break;

	case POWER_SUPPLY_PROP_CURRENT_AVG:

	case POWER_SUPPLY_PROP_POWER_AVG:

		val->intval = abs(battery->rate_avg) *

				acpi_battery_ipscale(battery) * 1000;

		val->intval *= (acpi_battery_mode(battery)) ?

				(battery->voltage_now *

				acpi_battery_vscale(battery) / 1000) : 1;

		break;

	case POWER_SUPPLY_PROP_CAPACITY:

		val->intval = battery->state_of_charge;