diff options
author | Len Brown <len.brown@intel.com> | 2007-03-20 11:06:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-20 11:06:00 -0400 |
commit | f5ea908c8fca3921c1545e6ac52edbbb353640f5 (patch) | |
tree | d8f780c44adc954891e1c8b08f682645cdbffaab /drivers/acpi/namespace/nsinit.c | |
parent | 54b8c39fbd76a7341b66e49de677ea366737fce7 (diff) | |
parent | a8f4af6dc6600980885c594f52eecd60edd62013 (diff) |
Pull bugzilla-8171 into release branch
Diffstat (limited to 'drivers/acpi/namespace/nsinit.c')
-rw-r--r-- | drivers/acpi/namespace/nsinit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c index 33db2241044..c4ab615f77f 100644 --- a/drivers/acpi/namespace/nsinit.c +++ b/drivers/acpi/namespace/nsinit.c @@ -214,7 +214,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle, u32 level, void *context, void **return_value) { acpi_object_type type; - acpi_status status = AE_OK; + acpi_status status; struct acpi_init_walk_info *info = (struct acpi_init_walk_info *)context; struct acpi_namespace_node *node = @@ -268,7 +268,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle, /* * Must lock the interpreter before executing AML code */ - acpi_ex_enter_interpreter(); + status = acpi_ex_enter_interpreter(); + if (ACPI_FAILURE(status)) { + return (status); + } /* * Each of these types can contain executable AML code within the |