diff options
author | Len Brown <len.brown@intel.com> | 2007-03-15 04:10:36 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-03-15 04:10:36 -0400 |
commit | a8f4af6dc6600980885c594f52eecd60edd62013 (patch) | |
tree | 818ff31a6fddaefc0a861cf967bb0120029f5fa3 /drivers/acpi/namespace/nsinit.c | |
parent | 4e337adae4e960f64043b9f433c4a825c902616c (diff) |
ACPICA: revert "acpi_serialize" changes
This reverts 977a6226feae3e2c10a4d8227625ff0f04b49239
and reverts 1ba753acb372c2955a4843302e92e49ce82e2fea
and updates acpi_ev_queue_notify_request()
to restore the previous implementation of the
"acpi_serialize" workaround.
http://bugzilla.kernel.org/show_bug.cgi?id=8171
Signed-off-by: Len Brown <len.brown@intel.com>
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 33db2241044e..c4ab615f77fe 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, | |||
214 | u32 level, void *context, void **return_value) | 214 | u32 level, void *context, void **return_value) |
215 | { | 215 | { |
216 | acpi_object_type type; | 216 | acpi_object_type type; |
217 | acpi_status status = AE_OK; | 217 | acpi_status status; |
218 | struct acpi_init_walk_info *info = | 218 | struct acpi_init_walk_info *info = |
219 | (struct acpi_init_walk_info *)context; | 219 | (struct acpi_init_walk_info *)context; |
220 | struct acpi_namespace_node *node = | 220 | struct acpi_namespace_node *node = |
@@ -268,7 +268,10 @@ acpi_ns_init_one_object(acpi_handle obj_handle, | |||
268 | /* | 268 | /* |
269 | * Must lock the interpreter before executing AML code | 269 | * Must lock the interpreter before executing AML code |
270 | */ | 270 | */ |
271 | acpi_ex_enter_interpreter(); | 271 | status = acpi_ex_enter_interpreter(); |
272 | if (ACPI_FAILURE(status)) { | ||
273 | return (status); | ||
274 | } | ||
272 | 275 | ||
273 | /* | 276 | /* |
274 | * Each of these types can contain executable AML code within the | 277 | * Each of these types can contain executable AML code within the |