ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n

PATCH Superseded Alan Jenkins 1 participant 1 message May 12, 2009 ACPI

Share & tools

Alan Jenkins

author

2009-05-12 14:50 UTC #0 lore raw

PATCH 1/3 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 <[email protected]>

drivers/acpi/battery.c +2 -2

index b0de631..2ccc87e 100644
@@ -501,13 +501,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);