diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 00:25:40 -0400 |
| commit | c172cb73bc79fe69915b1a1a48e374aa4b1f8a59 (patch) | |
| tree | eb3d6415914968441c063f7282e824b14b5a5edb /drivers/acpi/acpica/dsopcode.c | |
| parent | e8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (diff) | |
| parent | 28f4f8a9def2b1f3a6066bae791c77043ec49524 (diff) | |
Merge branch 'acpica-gpe' into release
Diffstat (limited to 'drivers/acpi/acpica/dsopcode.c')
| -rw-r--r-- | drivers/acpi/acpica/dsopcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c index 53a7e416f33e..7c0e74227171 100644 --- a/drivers/acpi/acpica/dsopcode.c +++ b/drivers/acpi/acpica/dsopcode.c | |||
| @@ -213,7 +213,7 @@ acpi_ds_get_buffer_field_arguments(union acpi_operand_object *obj_desc) | |||
| 213 | 213 | ||
| 214 | /* Execute the AML code for the term_arg arguments */ | 214 | /* Execute the AML code for the term_arg arguments */ |
| 215 | 215 | ||
| 216 | status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node), | 216 | status = acpi_ds_execute_arguments(node, node->parent, |
| 217 | extra_desc->extra.aml_length, | 217 | extra_desc->extra.aml_length, |
| 218 | extra_desc->extra.aml_start); | 218 | extra_desc->extra.aml_start); |
| 219 | return_ACPI_STATUS(status); | 219 | return_ACPI_STATUS(status); |
| @@ -257,7 +257,7 @@ acpi_ds_get_bank_field_arguments(union acpi_operand_object *obj_desc) | |||
| 257 | 257 | ||
| 258 | /* Execute the AML code for the term_arg arguments */ | 258 | /* Execute the AML code for the term_arg arguments */ |
| 259 | 259 | ||
| 260 | status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node), | 260 | status = acpi_ds_execute_arguments(node, node->parent, |
| 261 | extra_desc->extra.aml_length, | 261 | extra_desc->extra.aml_length, |
| 262 | extra_desc->extra.aml_start); | 262 | extra_desc->extra.aml_start); |
| 263 | return_ACPI_STATUS(status); | 263 | return_ACPI_STATUS(status); |
| @@ -394,7 +394,7 @@ acpi_status acpi_ds_get_region_arguments(union acpi_operand_object *obj_desc) | |||
| 394 | 394 | ||
| 395 | /* Execute the argument AML */ | 395 | /* Execute the argument AML */ |
| 396 | 396 | ||
| 397 | status = acpi_ds_execute_arguments(node, acpi_ns_get_parent_node(node), | 397 | status = acpi_ds_execute_arguments(node, node->parent, |
| 398 | extra_desc->extra.aml_length, | 398 | extra_desc->extra.aml_length, |
| 399 | extra_desc->extra.aml_start); | 399 | extra_desc->extra.aml_start); |
| 400 | if (ACPI_FAILURE(status)) { | 400 | if (ACPI_FAILURE(status)) { |