Commit aaad0776 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds

ACPI: Fix ACPI battery regression introduced by commit 558073

Commit 558073dd ("ACPI: battery: Convert
discharge energy rate to current properly") caused the battery subsystem
to report wrong values of the remaining time on battery power and the
time until fully charged on Toshiba Portege R500 (and presumably on
other boxes too).

Fix the issue by correcting the conversion from mW to mA.
Signed-off-by: default avatarRafael J. Wysocki <>
Signed-off-by: default avatarLinus Torvalds <>
parent 4857339d
......@@ -173,14 +173,17 @@ static int acpi_battery_get_property(struct power_supply *psy,
val->intval = battery->voltage_now * 1000;
val->intval = battery->current_now * 1000;
/* if power units are mW, convert to mA by
dividing by current voltage (mV/1000) */
if (!battery->power_unit) {
if (battery->voltage_now) {
val->intval = battery->current_now;
if (battery->power_unit) {
val->intval *= 1000;
} else {
* If power units are mW, convert to mA by dividing by
* current voltage.
if (battery->voltage_now)
val->intval /= battery->voltage_now;
val->intval *= 1000;
} else
val->intval = -1;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment