From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: [PATCH] ACPI: Battery: Allow extract string from integer Date: Mon, 29 Oct 2007 16:57:12 -0400 Message-ID: <200710291657.12962.lenb@kernel.org> References: <20071029202938.16515.24421.stgit@samsung> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from hera.kernel.org ([140.211.167.34]:36337 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347AbXJ2U5i (ORCPT ); Mon, 29 Oct 2007 16:57:38 -0400 In-Reply-To: <20071029202938.16515.24421.stgit@samsung> Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Alexey Starikovskiy , Frans Pop , Andrey Borzenkov Cc: Linux-acpi@vger.kernel.org Applied. Andrey, Frans, thanks for helping with Alexey's patch this weekend. -Len On Monday 29 October 2007 16:29, Alexey Starikovskiy wrote: > Some machines return integer instead of expected string. > > Signed-off-by: Alexey Starikovskiy > --- > > drivers/acpi/battery.c | 25 +++++++++++++++---------- > 1 files changed, 15 insertions(+), 10 deletions(-) > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > index 02a396d..6c06879 100644 > --- a/drivers/acpi/battery.c > +++ b/drivers/acpi/battery.c > @@ -260,7 +260,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; > @@ -269,16 +269,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); > - *x = element->integer.value; > + if (element->type == ACPI_TYPE_INTEGER) { > + int *x = (int *)((u8 *)battery + > + offsets[i].offset); > + *x = element->integer.value; > + } else return -EFAULT; > } > } > return 0; > > - > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >