Commit e363a755 authored Jun 30, 2009 by Alan Jenkins Committed by Len Brown Apr 04, 2010

ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n



Disabling CONFIG_ACPI_SYSFS_POWER changes the behaviour of
acpi_battery_update().  It will call acpi_battery_get_info()
even if the battery is not present.  I haven't noticed this
causing any problem, but it does look like a bad idea.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 2eaa9cfd

drivers/acpi/battery.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -567,13 +567,13 @@ static int acpi_battery_update(struct acpi_battery *battery)
		result = acpi_battery_get_status(battery);
		if (result)
		return result;
		#ifdef CONFIG_ACPI_SYSFS_POWER
		if (!acpi_battery_present(battery)) {
		#ifdef CONFIG_ACPI_SYSFS_POWER
		sysfs_remove_battery(battery);
		#endif
		battery->update_time = 0;
		return 0;
		}
		#endif
		if (!battery->update_time \|\|
		old_present != acpi_battery_present(battery)) {
		result = acpi_battery_get_info(battery);