From f4e7d8cf2ea87505b25b1fef20945e6cb1e207b1 Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Fri, 1 Jul 2011 16:03:39 +0800 Subject: [PATCH] --- yaml --- r: 262281 b: refs/heads/master c: e4108292cc5b5ca07abc83af31a78338362810ca h: refs/heads/master i: 262279: 9be41e64acb6f2c3af44428feb4f9d251c3c015b v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sbs.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 65fda875b2da..7065e5b8d4f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dd5c715e5b7524da8c1030f5cf1ea903e45c457 +refs/heads/master: e4108292cc5b5ca07abc83af31a78338362810ca diff --git a/trunk/drivers/acpi/sbs.c b/trunk/drivers/acpi/sbs.c index 01dad1bedd17..c517ec8106e9 100644 --- a/trunk/drivers/acpi/sbs.c +++ b/trunk/drivers/acpi/sbs.c @@ -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;