diff options
Diffstat (limited to 'drivers/acpi/acpica/dsopcode.c')
| -rw-r--r-- | drivers/acpi/acpica/dsopcode.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index 81d7b9863e32..1edd66f18907 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c | |||
| @@ -243,8 +243,9 @@ acpi_ds_init_buffer_field(u16 aml_opcode, | |||
| 243 | * For field_flags, use LOCK_RULE = 0 (NO_LOCK), | 243 | * For field_flags, use LOCK_RULE = 0 (NO_LOCK), |
| 244 | * UPDATE_RULE = 0 (UPDATE_PRESERVE) | 244 | * UPDATE_RULE = 0 (UPDATE_PRESERVE) |
| 245 | */ | 245 | */ |
| 246 | status = acpi_ex_prep_common_field_object(obj_desc, field_flags, 0, | 246 | status = |
| 247 | bit_offset, bit_count); | 247 | acpi_ex_prep_common_field_object(obj_desc, field_flags, 0, |
| 248 | bit_offset, bit_count); | ||
| 248 | if (ACPI_FAILURE(status)) { | 249 | if (ACPI_FAILURE(status)) { |
| 249 | goto cleanup; | 250 | goto cleanup; |
| 250 | } | 251 | } |
| @@ -330,8 +331,9 @@ acpi_ds_eval_buffer_field_operands(struct acpi_walk_state *walk_state, | |||
| 330 | 331 | ||
| 331 | /* Resolve the operands */ | 332 | /* Resolve the operands */ |
| 332 | 333 | ||
| 333 | status = acpi_ex_resolve_operands(op->common.aml_opcode, | 334 | status = |
| 334 | ACPI_WALK_OPERANDS, walk_state); | 335 | acpi_ex_resolve_operands(op->common.aml_opcode, ACPI_WALK_OPERANDS, |
| 336 | walk_state); | ||
| 335 | if (ACPI_FAILURE(status)) { | 337 | if (ACPI_FAILURE(status)) { |
| 336 | ACPI_ERROR((AE_INFO, "(%s) bad operand(s), status 0x%X", | 338 | ACPI_ERROR((AE_INFO, "(%s) bad operand(s), status 0x%X", |
| 337 | acpi_ps_get_opcode_name(op->common.aml_opcode), | 339 | acpi_ps_get_opcode_name(op->common.aml_opcode), |
| @@ -414,8 +416,9 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state, | |||
| 414 | 416 | ||
| 415 | /* Resolve the length and address operands to numbers */ | 417 | /* Resolve the length and address operands to numbers */ |
| 416 | 418 | ||
| 417 | status = acpi_ex_resolve_operands(op->common.aml_opcode, | 419 | status = |
| 418 | ACPI_WALK_OPERANDS, walk_state); | 420 | acpi_ex_resolve_operands(op->common.aml_opcode, ACPI_WALK_OPERANDS, |
| 421 | walk_state); | ||
| 419 | if (ACPI_FAILURE(status)) { | 422 | if (ACPI_FAILURE(status)) { |
| 420 | return_ACPI_STATUS(status); | 423 | return_ACPI_STATUS(status); |
| 421 | } | 424 | } |
| @@ -452,7 +455,6 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state, | |||
| 452 | /* Now the address and length are valid for this opregion */ | 455 | /* Now the address and length are valid for this opregion */ |
| 453 | 456 | ||
| 454 | obj_desc->region.flags |= AOPOBJ_DATA_VALID; | 457 | obj_desc->region.flags |= AOPOBJ_DATA_VALID; |
| 455 | |||
| 456 | return_ACPI_STATUS(status); | 458 | return_ACPI_STATUS(status); |
| 457 | } | 459 | } |
| 458 | 460 | ||
| @@ -510,8 +512,9 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state, | |||
| 510 | * Resolve the Signature string, oem_id string, | 512 | * Resolve the Signature string, oem_id string, |
| 511 | * and oem_table_id string operands | 513 | * and oem_table_id string operands |
| 512 | */ | 514 | */ |
| 513 | status = acpi_ex_resolve_operands(op->common.aml_opcode, | 515 | status = |
| 514 | ACPI_WALK_OPERANDS, walk_state); | 516 | acpi_ex_resolve_operands(op->common.aml_opcode, ACPI_WALK_OPERANDS, |
| 517 | walk_state); | ||
| 515 | if (ACPI_FAILURE(status)) { | 518 | if (ACPI_FAILURE(status)) { |
| 516 | goto cleanup; | 519 | goto cleanup; |
| 517 | } | 520 | } |
