Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 106449e8 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: Battery: Allow extract string from integer 



Some machines return integer instead of expected string.

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: default avatarAndrey Borzenkov <arvidjaar@mail.ru>
Tested-by: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0bde7eee

drivers/acpi/battery.c

+15 −10
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int extract_package(struct acpi_battery *battery, 
			   union acpi_object *package,

			   struct acpi_offsets *offsets, int num)

{

	int i, *x;

	int i;

	union acpi_object *element;

	if (package->type != ACPI_TYPE_PACKAGE)

		return -EFAULT;
@@ -271,16 +271,21 @@ static int extract_package(struct acpi_battery *battery, 
			return -EFAULT;

		element = &package->package.elements[i];

		if (offsets[i].mode) {

			if (element->type != ACPI_TYPE_STRING &&

			    element->type != ACPI_TYPE_BUFFER)

				return -EFAULT;

			strncpy((u8 *)battery + offsets[i].offset,

				element->string.pointer, 32);

			u8 *ptr = (u8 *)battery + offsets[i].offset;

			if (element->type == ACPI_TYPE_STRING ||

			    element->type == ACPI_TYPE_BUFFER)

				strncpy(ptr, 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 {

			if (element->type != ACPI_TYPE_INTEGER)

				return -EFAULT;

			x = (int *)((u8 *)battery + offsets[i].offset);

			if (element->type == ACPI_TYPE_INTEGER) {

				int *x = (int *)((u8 *)battery +

						offsets[i].offset);

				*x = element->integer.value;

			} else return -EFAULT;

		}

	}

	return 0;