From 0513b8acd9f230a11abe7b1752cac0b1892ce9df Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 11 Dec 2003 12:44:03 -0500 Subject: [PATCH] [ACPI] revert two fixes in preparation for ACPICA merge --- drivers/acpi/dispatcher/dsopcode.c | 8 +++++--- drivers/acpi/events/evgpe.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c index e31ac22e99f29..05730443cb50e 100644 --- a/drivers/acpi/dispatcher/dsopcode.c +++ b/drivers/acpi/dispatcher/dsopcode.c @@ -514,14 +514,16 @@ acpi_ds_init_buffer_field ( goto cleanup; } - /* Entire field must fit within the current length of the buffer */ if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) { ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Field size %d exceeds Buffer size %d (bits)\n", - bit_offset + bit_count, 8 * (u32) buffer_desc->buffer.length)); + "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n", + ((struct acpi_namespace_node *) result_desc)->name.ascii, + bit_offset + bit_count, + buffer_desc->buffer.node->name.ascii, + 8 * (u32) buffer_desc->buffer.length)); status = AE_AML_BUFFER_LIMIT; goto cleanup; } diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c index cc28b1f0ab51d..0108b47fadffb 100644 --- a/drivers/acpi/events/evgpe.c +++ b/drivers/acpi/events/evgpe.c @@ -217,8 +217,8 @@ acpi_ev_gpe_detect ( gpe_number = (i * ACPI_GPE_REGISTER_WIDTH) + j; int_status |= acpi_ev_gpe_dispatch ( - &gpe_block->event_info[gpe_number], - j + gpe_register_info->base_gpe_number); + &gpe_block->event_info[gpe_number], + gpe_number + gpe_block->register_info[gpe_number].base_gpe_number); } } } -- 2.53.0