diff options
author | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:21 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-05-10 02:49:21 -0400 |
commit | 3dd6786f55219f87fd33e153669600d715ca9270 (patch) | |
tree | 305f8389a93bf86df79f4cf8fb0050b1d6008939 /drivers/acpi/namespace/nsxfeval.c | |
parent | f697b677620d04d8c77841745727de85f7e948b1 (diff) | |
parent | 88db5e1489f23876a226f5393fd978ddc09dc5f9 (diff) |
Pull bugzilla-8385 into release branch
Diffstat (limited to 'drivers/acpi/namespace/nsxfeval.c')
-rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index 8904d0fae6a..7ac6ace5005 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.c @@ -170,7 +170,6 @@ acpi_evaluate_object(acpi_handle handle, struct acpi_buffer *return_buffer) { acpi_status status; - acpi_status status2; struct acpi_evaluate_info *info; acpi_size buffer_space_needed; u32 i; @@ -329,14 +328,12 @@ acpi_evaluate_object(acpi_handle handle, * Delete the internal return object. NOTE: Interpreter must be * locked to avoid race condition. */ - status2 = acpi_ex_enter_interpreter(); - if (ACPI_SUCCESS(status2)) { + acpi_ex_enter_interpreter(); - /* Remove one reference on the return object (should delete it) */ + /* Remove one reference on the return object (should delete it) */ - acpi_ut_remove_reference(info->return_object); - acpi_ex_exit_interpreter(); - } + acpi_ut_remove_reference(info->return_object); + acpi_ex_exit_interpreter(); } cleanup: |