diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dsobject.c')
-rw-r--r-- | drivers/acpi/dispatcher/dsobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c index 8b21f0f9e517..1f2d0c6ef36c 100644 --- a/drivers/acpi/dispatcher/dsobject.c +++ b/drivers/acpi/dispatcher/dsobject.c | |||
@@ -103,6 +103,7 @@ acpi_ds_build_internal_object(struct acpi_walk_state *walk_state, | |||
103 | common. | 103 | common. |
104 | node))); | 104 | node))); |
105 | if (ACPI_FAILURE(status)) { | 105 | if (ACPI_FAILURE(status)) { |
106 | |||
106 | /* Check if we are resolving a named reference within a package */ | 107 | /* Check if we are resolving a named reference within a package */ |
107 | 108 | ||
108 | if ((status == AE_NOT_FOUND) | 109 | if ((status == AE_NOT_FOUND) |
@@ -195,6 +196,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state, | |||
195 | */ | 196 | */ |
196 | obj_desc = *obj_desc_ptr; | 197 | obj_desc = *obj_desc_ptr; |
197 | if (!obj_desc) { | 198 | if (!obj_desc) { |
199 | |||
198 | /* Create a new buffer object */ | 200 | /* Create a new buffer object */ |
199 | 201 | ||
200 | obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER); | 202 | obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER); |
@@ -355,6 +357,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, | |||
355 | arg = arg->common.next; | 357 | arg = arg->common.next; |
356 | for (i = 0; arg; i++) { | 358 | for (i = 0; arg; i++) { |
357 | if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) { | 359 | if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) { |
360 | |||
358 | /* Object (package or buffer) is already built */ | 361 | /* Object (package or buffer) is already built */ |
359 | 362 | ||
360 | obj_desc->package.elements[i] = | 363 | obj_desc->package.elements[i] = |
@@ -408,6 +411,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state, | |||
408 | } | 411 | } |
409 | 412 | ||
410 | if (!op->common.value.arg) { | 413 | if (!op->common.value.arg) { |
414 | |||
411 | /* No arguments, there is nothing to do */ | 415 | /* No arguments, there is nothing to do */ |
412 | 416 | ||
413 | return_ACPI_STATUS(AE_OK); | 417 | return_ACPI_STATUS(AE_OK); |
@@ -469,6 +473,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, | |||
469 | obj_desc = *ret_obj_desc; | 473 | obj_desc = *ret_obj_desc; |
470 | op_info = acpi_ps_get_opcode_info(opcode); | 474 | op_info = acpi_ps_get_opcode_info(opcode); |
471 | if (op_info->class == AML_CLASS_UNKNOWN) { | 475 | if (op_info->class == AML_CLASS_UNKNOWN) { |
476 | |||
472 | /* Unknown opcode */ | 477 | /* Unknown opcode */ |
473 | 478 | ||
474 | return_ACPI_STATUS(AE_TYPE); | 479 | return_ACPI_STATUS(AE_TYPE); |
@@ -626,6 +631,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state, | |||
626 | default: /* Other literals, etc.. */ | 631 | default: /* Other literals, etc.. */ |
627 | 632 | ||
628 | if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) { | 633 | if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) { |
634 | |||
629 | /* Node was saved in Op */ | 635 | /* Node was saved in Op */ |
630 | 636 | ||
631 | obj_desc->reference.node = op->common.node; | 637 | obj_desc->reference.node = op->common.node; |