From: Bjørn Mork Date: Tue, 9 Sep 2014 08:45:17 +0000 (+0200) Subject: Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()" X-Git-Tag: fixes-for-v3.18-merge-window~148^2^4~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=583ee394ac503ff9eac0f50673cd569643bdb3b4;p=pandora-kernel.git Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()" This reverts commit d719870b41e0 ("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: d719870b41e0 ("ACPI / battery: Fix warning message in acpi_battery_get_state()") Cc: 3.16+ # 3.16+ Signed-off-by: Bjørn Mork Signed-off-by: Rafael J. Wysocki --- Reading git-diff-tree failed