* [PATCH 1/3] ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
@ 2009-05-12 14:50 Alan Jenkins
0 siblings, 0 replies; only message in thread
From: Alan Jenkins @ 2009-05-12 14:50 UTC (permalink / raw)
To: linux acpi; +Cc: Alexey Starikovskiy
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>
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b0de631..2ccc87e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -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);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-12 14:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-12 14:50 [PATCH 1/3] ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n Alan Jenkins
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox