From edf1091901a70453ae5715d21d80df7c0213262b Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Mon, 9 Jun 2008 16:22:26 -0700 Subject: [PATCH] --- yaml --- r: 98003 b: refs/heads/master c: 46a21e465e506bcd4dba759a39e7ef79978a705d h: refs/heads/master i: 98001: 4787939da50f08f215b20f1acb1d1b4c95dbb58c 97999: f753fdeb98ee944488f94109d889253fad5c031d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/system.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index f0fac43baf88..d62e7a6bba0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7efd52a407bed6a2b02015b8ebbff7beba155392 +refs/heads/master: 46a21e465e506bcd4dba759a39e7ef79978a705d diff --git a/trunk/drivers/acpi/system.c b/trunk/drivers/acpi/system.c index 769f24855eb6..5bd2dec9a7ac 100644 --- a/trunk/drivers/acpi/system.c +++ b/trunk/drivers/acpi/system.c @@ -77,7 +77,6 @@ static ssize_t acpi_table_show(struct kobject *kobj, container_of(bin_attr, struct acpi_table_attr, attr); struct acpi_table_header *table_header = NULL; acpi_status status; - ssize_t ret_count = count; status = acpi_get_table(table_attr->name, table_attr->instance, @@ -85,18 +84,8 @@ static ssize_t acpi_table_show(struct kobject *kobj, if (ACPI_FAILURE(status)) return -ENODEV; - if (offset >= table_header->length) { - ret_count = 0; - goto end; - } - - if (offset + ret_count > table_header->length) - ret_count = table_header->length - offset; - - memcpy(buf, ((char *)table_header) + offset, ret_count); - - end: - return ret_count; + return memory_read_from_buffer(buf, count, &offset, + table_header, table_header->length); } static void acpi_table_attr_init(struct acpi_table_attr *table_attr,