Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756055AbaFLO6e (ORCPT ); Thu, 12 Jun 2014 10:58:34 -0400 Received: from w-smtp-out-7.wedos.net ([46.28.106.5]:55646 "EHLO we2-f167.wedos.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752898AbaFLO6b (ORCPT ); Thu, 12 Jun 2014 10:58:31 -0400 Date: Thu, 12 Jun 2014 16:58:13 +0200 From: Josef Gajdusek To: rjw@rjwysocki.net Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] acpi/battery: fix wrong value of capacity_now reported by few battery types when fully charged (resend) Message-ID: <20140612145813.GB14085@dashie> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It seems that some batteries (noticed on DELL JYPJ136) assume capacity_now = design_capacity when fully charged. This causes reported capacity to suddenly jump to >full_charge_capacity (and that means capacity reported to userspace is >100% and incorrect) values after 99%. This patch attempts to detect this bug and trims capacity_now properly. Signed-off-by: Josef Gajdusek --- Oops, I forgot to sign the previous one. diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index e48fc98..3338dd5 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -532,6 +532,14 @@ static int acpi_battery_get_state(struct acpi_battery *battery) " invalid.\n"); } + /* When fully charged, some batteries wrongly report + * capacity_now = design_capacity instead of = full_charge_capacity + */ + if (battery->capacity_now == battery->design_capacity && + battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) + battery->capacity_now = battery->full_charge_capacity; + + if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags) && battery->capacity_now >= 0 && battery->capacity_now <= 100) battery->capacity_now = (battery->capacity_now * -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/