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

Commit 583ee394 authored by Bjørn Mork's avatar Bjørn Mork Committed by Rafael J. Wysocki
Browse files

Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()" 



This reverts commit d719870b ("ACPI / battery: Fix warning message in
acpi_battery_get_state()")

Capping 'capacity_now' to 'full_charge_capacity' is plain wrong. If this
is necessary to work around some buggy firmware, then the workaround needs
protection against being applied to working firmwares.

Good battery firmwares will allow 'capacity_now' to increase above
'full_charge_capacity', and will update the latter when the battery
is fully charged.  By capping 'capacity_now' we lose accurate capacity
reporting until charging is complete whenever 'full_charge_capacity'
needs to be increased.

Fixes: d719870b ("ACPI / battery: Fix warning message in acpi_battery_get_state()")
Cc: 3.16+ <stable@vger.kernel.org> # 3.16+
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2ce7598c

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)