Andrew Morton wrote: > acpi_battery has no field `current_now' in 2.6.30 or 2.6.31-rc1. Which > kernel version are you patching here? Updated patch for 2.6.30 attached. current_now got renamed to rate_now. -- Hector Martin (hector@xxxxxxxxxxxxxx) Public Key: http://www.marcansoft.com/marcan.asc
Signed-off-by: Hector Martin <hector@xxxxxxxxxxxxxx"> --- linux-2.6.30-gentoo-r1/drivers/acpi/battery.c.old 2009-07-02 04:04:52.000000000 +0200 +++ linux-2.6.30-gentoo-r1/drivers/acpi/battery.c 2009-07-02 04:07:20.000000000 +0200 @@ -85,6 +85,10 @@ static const struct acpi_device_id batte MODULE_DEVICE_TABLE(acpi, battery_device_ids); +/* For buggy DSDTs that report negative 16-bit values for either charging + * or discharging current and/or report 0 as 65536 due to bad math. + */ +#define QUIRK_SIGNED16_CURRENT 0x0001 struct acpi_battery { struct mutex lock; @@ -112,6 +116,7 @@ struct acpi_battery { int state; int power_unit; u8 alarm_present; + long quirks; }; #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat); @@ -390,6 +395,11 @@ static int acpi_battery_get_state(struct state_offsets, ARRAY_SIZE(state_offsets)); battery->update_time = jiffies; kfree(buffer.pointer); + + if ((battery->quirks & QUIRK_SIGNED16_CURRENT) && + battery->rate_now != -1) + battery->rate_now = abs((s16)battery->rate_now); + return result; } @@ -495,6 +505,14 @@ static void sysfs_remove_battery(struct } #endif +static void acpi_battery_quirks(struct acpi_battery *battery) +{ + battery->quirks = 0; + if (dmi_name_in_vendors("Acer") && battery->power_unit) { + battery->quirks |= QUIRK_SIGNED16_CURRENT; + } +} + static int acpi_battery_update(struct acpi_battery *battery) { int result, old_present = acpi_battery_present(battery); @@ -513,6 +531,7 @@ static int acpi_battery_update(struct ac result = acpi_battery_get_info(battery); if (result) return result; + acpi_battery_quirks(battery); acpi_battery_init_alarm(battery); } #ifdef CONFIG_ACPI_SYSFS_POWER