diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-17 22:37:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-03-17 22:37:42 -0400 |
| commit | b8a1bdb14940946fcf0438a6337b2a6c54294fb8 (patch) | |
| tree | 498f92631efd34ad555c83714d4427f65de5ec39 /drivers/acpi | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
| download | op-kernel-dev-b8a1bdb14940946fcf0438a6337b2a6c54294fb8.zip op-kernel-dev-b8a1bdb14940946fcf0438a6337b2a6c54294fb8.tar.gz | |
ACPI: battery: Don't return -EFAIL on broken packages.
Acer BIOS has a bug which is exposed when a dead battery is present.
The package template that is used to describe battery status is
over-written with sane values when the battery is live.
But when the batter is dead, a bogus reference in the template
is used. In this case, Linux returns a fault, when instead
it should simply return that it doesn't know the missing value.
http://bugzilla.kernel.org/show_bug.cgi?id=8573
http://bugzilla.kernel.org/show_bug.cgi?id=10202
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/battery.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index f6215e8..d5729d5 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -293,13 +293,12 @@ static int extract_package(struct acpi_battery *battery, strncpy(ptr, (u8 *)&element->integer.value, sizeof(acpi_integer)); ptr[sizeof(acpi_integer)] = 0; - } else return -EFAULT; + } else + *ptr = 0; /* don't have value */ } else { - if (element->type == ACPI_TYPE_INTEGER) { - int *x = (int *)((u8 *)battery + - offsets[i].offset); - *x = element->integer.value; - } else return -EFAULT; + int *x = (int *)((u8 *)battery + offsets[i].offset); + *x = (element->type == ACPI_TYPE_INTEGER) ? + element->integer.value : -1; } } return 0; |
