aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/psxface.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/psxface.c')
-rw-r--r--drivers/acpi/acpica/psxface.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index dd9731c29a79..6064dd4e94c2 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2008, Intel Corp. 8 * Copyright (C) 2000 - 2010, Intel Corp.
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -287,7 +287,8 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
287 /* Invoke an internal method if necessary */ 287 /* Invoke an internal method if necessary */
288 288
289 if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) { 289 if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
290 status = info->obj_desc->method.implementation(walk_state); 290 status =
291 info->obj_desc->method.extra.implementation(walk_state);
291 info->return_object = walk_state->return_desc; 292 info->return_object = walk_state->return_desc;
292 293
293 /* Cleanup states */ 294 /* Cleanup states */
@@ -306,14 +307,12 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
306 */ 307 */
307 if (acpi_gbl_enable_interpreter_slack) { 308 if (acpi_gbl_enable_interpreter_slack) {
308 walk_state->implicit_return_obj = 309 walk_state->implicit_return_obj =
309 acpi_ut_create_internal_object(ACPI_TYPE_INTEGER); 310 acpi_ut_create_integer_object((u64) 0);
310 if (!walk_state->implicit_return_obj) { 311 if (!walk_state->implicit_return_obj) {
311 status = AE_NO_MEMORY; 312 status = AE_NO_MEMORY;
312 acpi_ds_delete_walk_state(walk_state); 313 acpi_ds_delete_walk_state(walk_state);
313 goto cleanup; 314 goto cleanup;
314 } 315 }
315
316 walk_state->implicit_return_obj->integer.value = 0;
317 } 316 }
318 317
319 /* Parse the AML */ 318 /* Parse the AML */