Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d719870b authored by Mariusz Ceier's avatar Mariusz Ceier Committed by Rafael J. Wysocki
Browse files

ACPI / battery: Fix warning message in acpi_battery_get_state() 



capacity_now should be assigned after comparing it to design_capacity.

Otherwise warning is printed even when capacity_now before assignment is
equal to design_capacity, making the check useless and "current charge level"
wrong (it should be higher than, not equal to, "maximum charge level", which
is full_charge_capacity):

"battery: reported current charge level (56410) is higher than reported
maximum charge level (56410)."

Fixes: 232de514 (ACPI / battery: fix wrong value of capacity_now reported when fully charged)
Signed-off-by: default avatarMariusz Ceier <mceier+kernel@gmail.com>
Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
[rjw: Subject]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3a54a57d

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -540,12 +540,12 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	 */

	if (battery->capacity_now > battery->full_charge_capacity

	    && battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) {

		battery->capacity_now = battery->full_charge_capacity;

		if (battery->capacity_now != battery->design_capacity)

			printk_once(KERN_WARNING FW_BUG

				"battery: reported current charge level (%d) "

				"is higher than reported maximum charge level (%d).\n",

				battery->capacity_now, battery->full_charge_capacity);

		battery->capacity_now = battery->full_charge_capacity;

	}



	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)