Commit b23fffd7 authored Jan 20, 2011 by Linus Torvalds

ACPI / Battery: remove battery refresh on resume



This partially reverts commit da8aeb92
("ACPI / Battery: Update information on info notification and resume"),
which causes a hang on resume on at least some machines.

This bug was bisected on an ASUS EeePC 901, which hangs at resume time
if we do that "acpi_battery_refresh(battery)" in the battery resume
function.

Rafael suspects we'll still need to refresh the sysfs files upon resume,
but that that can be done from a PM notifier (that will run after
thawing user space).

Bisected-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 12fcdba1

drivers/acpi/battery.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -998,7 +998,6 @@ static int acpi_battery_resume(struct acpi_device *device)
		if (!device)
		return -EINVAL;
		battery = acpi_driver_data(device);
		acpi_battery_refresh(battery);
		battery->update_time = 0;
		acpi_battery_update(battery);
		return 0;

Admin message