From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Tue, 30 Jun 2009 14:35:05 +0000 (+0000)
Subject: ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
X-Git-Tag: v2.6.34-rc4~21^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e363a755e8033e18f733fc0d1687039df8efade0;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 75f39f2c166..52df9947dbb 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -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);