diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-09 22:56:38 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-09 22:56:38 -0400 |
| commit | 4d2acd9ea539e0f59178b126f6750ccc41eefcdd (patch) | |
| tree | 6d9e47c9ab33a1ce2c02139b6bf5c029c2abad32 /drivers/acpi/namespace/nsxfeval.c | |
| parent | b5f0adbcc4f16e378882d8f68fe3111df04911be (diff) | |
| download | op-kernel-dev-4d2acd9ea539e0f59178b126f6750ccc41eefcdd.zip op-kernel-dev-4d2acd9ea539e0f59178b126f6750ccc41eefcdd.tar.gz | |
Revert "ACPICA: revert "acpi_serialize" changes"
This reverts commit a8f4af6dc6600980885c594f52eecd60edd62013.
Thus restoring ACPICA's new acpi_serialize code.
This commit by itself may cause a regression, but
it is reverted in this order so that subsequent
reverts reverts under this one can be made
without conflict.
Signed-off-by: Len Brown <len.brown@intel.com>
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 8904d0f..7ac6ace 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: |
