Commit 0513b8ac authored by Len Brown's avatar Len Brown

[ACPI] revert two fixes in preparation for ACPICA merge

parent a07bfd00
...@@ -514,14 +514,16 @@ acpi_ds_init_buffer_field ( ...@@ -514,14 +514,16 @@ acpi_ds_init_buffer_field (
goto cleanup; goto cleanup;
} }
/* Entire field must fit within the current length of the buffer */ /* Entire field must fit within the current length of the buffer */
if ((bit_offset + bit_count) > if ((bit_offset + bit_count) >
(8 * (u32) buffer_desc->buffer.length)) { (8 * (u32) buffer_desc->buffer.length)) {
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
"Field size %d exceeds Buffer size %d (bits)\n", "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
bit_offset + bit_count, 8 * (u32) buffer_desc->buffer.length)); ((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; status = AE_AML_BUFFER_LIMIT;
goto cleanup; goto cleanup;
} }
......
...@@ -218,7 +218,7 @@ acpi_ev_gpe_detect ( ...@@ -218,7 +218,7 @@ acpi_ev_gpe_detect (
int_status |= acpi_ev_gpe_dispatch ( int_status |= acpi_ev_gpe_dispatch (
&gpe_block->event_info[gpe_number], &gpe_block->event_info[gpe_number],
j + gpe_register_info->base_gpe_number); gpe_number + gpe_block->register_info[gpe_number].base_gpe_number);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment