Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4bd35cdb1e2d1a1bbbe4b75132718e79b80519ab
Commit: 4bd35cdb1e2d1a1bbbe4b75132718e79b80519ab
Parent: eaefd5fb7d793c9c1bcef1b0c0d5ec3824a85b91
Author: Vladimir Lebedev <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 10 01:43:48 2007 -0500
Committer: Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Feb 10 01:43:48 2007 -0500
ACPI: battery: check for battery present on /proc/battery access
http://bugzilla.kernel.org/show_bug.cgi?id=7200
Signed-off-by: Vladimir Lebedev <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
drivers/acpi/battery.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 2f4521a..0d7a32e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -324,6 +324,13 @@ static int acpi_battery_check(struct acpi_battery *battery)
return result;
}
+static void acpi_battery_check_present(struct acpi_battery *battery)
+{
+ if (!battery->flags.present) {
+ acpi_battery_check(battery);
+ }
+}
+
/* --------------------------------------------------------------------------
FS Interface (/proc)
--------------------------------------------------------------------------
*/
@@ -340,6 +347,8 @@ static int acpi_battery_read_info(struct seq_file *seq,
void *offset)
if (!battery)
goto end;
+ acpi_battery_check_present(battery);
+
if (battery->flags.present)
seq_printf(seq, "present: yes\n");
else {
@@ -424,6 +433,8 @@ static int acpi_battery_read_state(struct seq_file *seq,
void *offset)
if (!battery)
goto end;
+ acpi_battery_check_present(battery);
+
if (battery->flags.present)
seq_printf(seq, "present: yes\n");
else {
@@ -499,6 +510,8 @@ static int acpi_battery_read_alarm(struct seq_file *seq,
void *offset)
if (!battery)
goto end;
+ acpi_battery_check_present(battery);
+
if (!battery->flags.present) {
seq_printf(seq, "present: no\n");
goto end;
@@ -536,6 +549,8 @@ acpi_battery_write_alarm(struct file *file,
if (!battery || (count > sizeof(alarm_string) - 1))
return -EINVAL;
+ acpi_battery_check_present(battery);
+
if (!battery->flags.present)
return -ENODEV;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
