diff options
Diffstat (limited to 'drivers/acpi/acpica/psparse.c')
-rw-r--r-- | drivers/acpi/acpica/psparse.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c index 70838e9b608c..8d81542194d4 100644 --- a/drivers/acpi/acpica/psparse.c +++ b/drivers/acpi/acpica/psparse.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 |
@@ -610,17 +610,13 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) | |||
610 | implicit_return_obj) { | 610 | implicit_return_obj) { |
611 | previous_walk_state-> | 611 | previous_walk_state-> |
612 | implicit_return_obj = | 612 | implicit_return_obj = |
613 | acpi_ut_create_internal_object | 613 | acpi_ut_create_integer_object |
614 | (ACPI_TYPE_INTEGER); | 614 | ((u64) 0); |
615 | if (!previous_walk_state-> | 615 | if (!previous_walk_state-> |
616 | implicit_return_obj) { | 616 | implicit_return_obj) { |
617 | return_ACPI_STATUS | 617 | return_ACPI_STATUS |
618 | (AE_NO_MEMORY); | 618 | (AE_NO_MEMORY); |
619 | } | 619 | } |
620 | |||
621 | previous_walk_state-> | ||
622 | implicit_return_obj-> | ||
623 | integer.value = 0; | ||
624 | } | 620 | } |
625 | 621 | ||
626 | /* Restart the calling control method */ | 622 | /* Restart the calling control method */ |