dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Pull bugzilla-7200 into release branch

This commit is contained in:
Len Brown 2007-02-16 22:11:37 -05:00
parent 1004879f25 4bd35cdb1e
commit 4559b43822
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/acpi/battery.c
View File

@ -323,6 +323,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)
-------------------------------------------------------------------------- */
@ -339,6 +346,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 {
@ -423,6 +432,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 {
@ -498,6 +509,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;
@ -535,6 +548,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;