niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ACPI: Battery: Allow extract string from integer

Browse source 
Some machines return integer instead of expected string.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Andrey Borzenkov <arvidjaar@mail.ru>
Tested-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy 2007-10-29 23:29:40 +03:00 • committed by Len Brown
parent 0bde7eee94
commit 106449e870
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/acpi/battery.c
View file

@ -262,7 +262,7 @@ static int extract_package(struct acpi_battery *battery,
union acpi_object *package, union acpi_object *package,
struct acpi_offsets *offsets, int num) struct acpi_offsets *offsets, int num)
{ {
int i, *x; int i;
union acpi_object *element; union acpi_object *element;
if (package->type != ACPI_TYPE_PACKAGE) if (package->type != ACPI_TYPE_PACKAGE)
return -EFAULT; return -EFAULT;
@ -271,16 +271,21 @@ static int extract_package(struct acpi_battery *battery,
return -EFAULT; return -EFAULT;
element = &package->package.elements[i]; element = &package->package.elements[i];
if (offsets[i].mode) { if (offsets[i].mode) {
if (element->type != ACPI_TYPE_STRING && u8 *ptr = (u8 *)battery + offsets[i].offset;
element->type != ACPI_TYPE_BUFFER) if (element->type == ACPI_TYPE_STRING ||
return -EFAULT; element->type == ACPI_TYPE_BUFFER)
strncpy((u8 *)battery + offsets[i].offset, strncpy(ptr, element->string.pointer, 32);
element->string.pointer, 32); else if (element->type == ACPI_TYPE_INTEGER) {
strncpy(ptr, (u8 *)&element->integer.value,
sizeof(acpi_integer));
ptr[sizeof(acpi_integer)] = 0;
} else return -EFAULT;
} else { } else {
if (element->type != ACPI_TYPE_INTEGER) if (element->type == ACPI_TYPE_INTEGER) {
return -EFAULT; int *x = (int *)((u8 *)battery +
x = (int *)((u8 *)battery + offsets[i].offset); offsets[i].offset);
*x = element->integer.value; *x = element->integer.value;
} else return -EFAULT;
} }
} }
return 0; return 0;