From cde44d1740bcb3dcfecbf792a71826431e61686e Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 24 Dec 2010 21:43:16 -0500 Subject: [PATCH] Revert "ACPI battery: update status upon sysfs query" This reverts commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b. as it caused a crash upon battery removal: https://bugzilla.kernel.org/show_bug.cgi?id=25302 Signed-off-by: Len Brown --- drivers/acpi/battery.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 9fb9d5a..95649d3 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -130,8 +130,6 @@ struct acpi_battery { unsigned long flags; }; -static int acpi_battery_update(struct acpi_battery *battery); - #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat); inline int acpi_battery_present(struct acpi_battery *battery) @@ -186,9 +184,6 @@ static int acpi_battery_get_property(struct power_supply *psy, int ret = 0; struct acpi_battery *battery = to_acpi_battery(psy); - if (acpi_battery_update(battery)) - return -ENODEV; - if (acpi_battery_present(battery)) { /* run battery update only if it is present */ acpi_battery_get_state(battery); -- 2.7.4