ACPICA: revert "acpi_serialize" changes

[powerpc.git] / drivers / acpi / namespace / nsxfeval.c

diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 7ac6ace..8904d0f 100644 (file)
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -170,6 +170,7 @@ 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;
@@ -328,12 +329,14 @@ acpi_evaluate_object(acpi_handle handle,
                 * Delete the internal return object. NOTE: Interpreter must be
                 * locked to avoid race condition.
                 */
-               acpi_ex_enter_interpreter();
+               status2 = acpi_ex_enter_interpreter();
+               if (ACPI_SUCCESS(status2)) {
 
-               /* 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: