Эх сурвалжийг харах

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 <len.brown@intel.com>
Len Brown 14 жил өмнө
parent
commit
cde44d1740

+ 0 - 5
drivers/acpi/battery.c

@@ -130,8 +130,6 @@ struct acpi_battery {
 	unsigned long flags;
 	unsigned long flags;
 };
 };
 
 
-static int acpi_battery_update(struct acpi_battery *battery);
-
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
 #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);
 
 
 inline int acpi_battery_present(struct acpi_battery *battery)
 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;
 	int ret = 0;
 	struct acpi_battery *battery = to_acpi_battery(psy);
 	struct acpi_battery *battery = to_acpi_battery(psy);
 
 
-	if (acpi_battery_update(battery))
-		return -ENODEV;
-
 	if (acpi_battery_present(battery)) {
 	if (acpi_battery_present(battery)) {
 		/* run battery update only if it is present */
 		/* run battery update only if it is present */
 		acpi_battery_get_state(battery);
 		acpi_battery_get_state(battery);