aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/namespace/nsinit.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-05-10 02:49:21 -0400
committerLen Brown <len.brown@intel.com>2007-05-10 02:49:21 -0400
commit3dd6786f55219f87fd33e153669600d715ca9270 (patch)
tree305f8389a93bf86df79f4cf8fb0050b1d6008939 /drivers/acpi/namespace/nsinit.c
parentf697b677620d04d8c77841745727de85f7e948b1 (diff)
parent88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff)
Pull bugzilla-8385 into release branch
Diffstat (limited to 'drivers/acpi/namespace/nsinit.c')
-rw-r--r--drivers/acpi/namespace/nsinit.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index c4ab615f77f..33db2241044 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;
+ acpi_status status = AE_OK;
struct acpi_init_walk_info *info =
(struct acpi_init_walk_info *)context;
struct acpi_namespace_node *node =
@@ -268,10 +268,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
/*
* Must lock the interpreter before executing AML code
*/
- status = acpi_ex_enter_interpreter();
- if (ACPI_FAILURE(status)) {
- return (status);
- }
+ acpi_ex_enter_interpreter();
/*
* Each of these types can contain executable AML code within the