diff options
Diffstat (limited to 'drivers/acpi/acpica/dsopcode.c')
-rw-r--r-- | drivers/acpi/acpica/dsopcode.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index 78f9de260d5f..a0b821031063 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c | |||
@@ -130,8 +130,8 @@ acpi_ds_init_buffer_field(u16 aml_opcode, | |||
130 | /* Must have a valid (>0) bit count */ | 130 | /* Must have a valid (>0) bit count */ |
131 | 131 | ||
132 | if (bit_count == 0) { | 132 | if (bit_count == 0) { |
133 | ACPI_ERROR((AE_INFO, | 133 | ACPI_BIOS_ERROR((AE_INFO, |
134 | "Attempt to CreateField of length zero")); | 134 | "Attempt to CreateField of length zero")); |
135 | status = AE_AML_OPERAND_VALUE; | 135 | status = AE_AML_OPERAND_VALUE; |
136 | goto cleanup; | 136 | goto cleanup; |
137 | } | 137 | } |
@@ -194,12 +194,13 @@ acpi_ds_init_buffer_field(u16 aml_opcode, | |||
194 | /* Entire field must fit within the current length of the buffer */ | 194 | /* Entire field must fit within the current length of the buffer */ |
195 | 195 | ||
196 | if ((bit_offset + bit_count) > (8 * (u32)buffer_desc->buffer.length)) { | 196 | if ((bit_offset + bit_count) > (8 * (u32)buffer_desc->buffer.length)) { |
197 | ACPI_ERROR((AE_INFO, | ||
198 | "Field [%4.4s] at bit offset/length %u/%u " | ||
199 | "exceeds size of target Buffer (%u bits)", | ||
200 | acpi_ut_get_node_name(result_desc), bit_offset, | ||
201 | bit_count, 8 * (u32)buffer_desc->buffer.length)); | ||
202 | status = AE_AML_BUFFER_LIMIT; | 197 | status = AE_AML_BUFFER_LIMIT; |
198 | ACPI_BIOS_EXCEPTION((AE_INFO, status, | ||
199 | "Field [%4.4s] at bit offset/length %u/%u " | ||
200 | "exceeds size of target Buffer (%u bits)", | ||
201 | acpi_ut_get_node_name(result_desc), | ||
202 | bit_offset, bit_count, | ||
203 | 8 * (u32)buffer_desc->buffer.length)); | ||
203 | goto cleanup; | 204 | goto cleanup; |
204 | } | 205 | } |
205 | 206 | ||