diff options
author | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
commit | 985f38781d19101aba121df423f92c87b208c6df (patch) | |
tree | 21b10413b6e24c0eaf5c3b2432e936749a672644 /drivers/acpi/acpica/nsdumpdv.c | |
parent | d093d70a81b08673d1577ad73419998f02be9d29 (diff) | |
parent | c9766237afa92e8d7f27bbcd4964f1b43fa0bce8 (diff) |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/acpi/acpica/nsdumpdv.c')
-rw-r--r-- | drivers/acpi/acpica/nsdumpdv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/nsdumpdv.c b/drivers/acpi/acpica/nsdumpdv.c index 41994fe7fbb..0fe87f1aef1 100644 --- a/drivers/acpi/acpica/nsdumpdv.c +++ b/drivers/acpi/acpica/nsdumpdv.c @@ -70,7 +70,6 @@ static acpi_status acpi_ns_dump_one_device(acpi_handle obj_handle, u32 level, void *context, void **return_value) { - struct acpi_buffer buffer; struct acpi_device_info *info; acpi_status status; u32 i; @@ -80,17 +79,15 @@ acpi_ns_dump_one_device(acpi_handle obj_handle, status = acpi_ns_dump_one_object(obj_handle, level, context, return_value); - buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; - status = acpi_get_object_info(obj_handle, &buffer); + status = acpi_get_object_info(obj_handle, &info); if (ACPI_SUCCESS(status)) { - info = buffer.pointer; for (i = 0; i < level; i++) { ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, " ")); } ACPI_DEBUG_PRINT_RAW((ACPI_DB_TABLES, " HID: %s, ADR: %8.8X%8.8X, Status: %X\n", - info->hardware_id.value, + info->hardware_id.string, ACPI_FORMAT_UINT64(info->address), info->current_status)); ACPI_FREE(info); |