qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI fix for 6.16-rc5. 

Revert a problematic ACPI battery driver change merged recently.
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmhoNwASHHJqd0Byand5
 c29ja2kubmV0AAoJEO5fvZ0v1OO1dBoIAJq1fO+BYnCbchij40RdfS5QV/5Qftca
 bc+BWKvUiAh+phmlsTALX+KO/WtEQCYMOsSmO83UQOSjsRTyqkOCYjgjlcTx1Hl9
 5ktluwjvocgODj/f2/hKpPvTDyZ5rKFcc16NKESoXWKJ5TSivJqIrBFvas0+rP0R
 /qHfUdZcPEyeUMRIbw7NK4ltCw1WlcO1O2CGaKfstBXAAkTo1DObrswm2vXwr/6n
 HtpM4yUfJEw73VSPditGlMs+pKvCzj5MNLzEGqF7cBXNTwVCHVFtVFkpQ0E7Rz5o
 X8krjH2NaUWHaRhgD9pWMBvM/eGRn7F/17ZYmALxYekODHDYGm9Wyvk=
 =RQOU
 -----END PGP SIGNATURE-----

Merge tag 'acpi-6.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Revert a problematic ACPI battery driver change merged recently"

* tag 'acpi-6.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: battery: negate current when discharging"
This commit is contained in:
Linus Torvalds 2025-07-04 17:25:41 -07:00
parent b1bf2ef625 de1675de39
commit 49dcc4f601
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/acpi/battery.c
View File

@ -243,23 +243,10 @@ static int acpi_battery_get_property(struct power_supply *psy,
break;
case POWER_SUPPLY_PROP_CURRENT_NOW:
case POWER_SUPPLY_PROP_POWER_NOW:
if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN) {
if (battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN)
ret = -ENODEV;
break;
}
val->intval = battery->rate_now * 1000;
/*
* When discharging, the current should be reported as a
* negative number as per the power supply class interface
* definition.
*/
if (psp == POWER_SUPPLY_PROP_CURRENT_NOW &&
(battery->state & ACPI_BATTERY_STATE_DISCHARGING) &&
acpi_battery_handle_discharging(battery)
== POWER_SUPPLY_STATUS_DISCHARGING)
val->intval = -val->intval;
else
val->intval = battery->rate_now * 1000;
break;
case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: