ACPICA 20050708 from Bob Moore <robert.moore@intel.com>

[linux-2.6] / drivers / acpi / parser / psxface.c

diff --git a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c
index dba893648e84b762cba90073ba1b5df05b29bd5f..5279b51e77874d7693fe8d276a1c5a3fbe4bd796 100644 (file)
--- a/drivers/acpi/parser/psxface.c
+++ b/drivers/acpi/parser/psxface.c
@@ -138,11 +138,14 @@ acpi_psx_execute (
         * objects (such as Operation Regions) can be created during the
         * first pass parse.
         */
-       obj_desc->method.owning_id = acpi_ut_allocate_owner_id (ACPI_OWNER_TYPE_METHOD);
+       status = acpi_ut_allocate_owner_id (&obj_desc->method.owner_id);
+       if (ACPI_FAILURE (status)) {
+               goto cleanup2;
+       }
 
        /* Create and initialize a new walk state */
 
-       walk_state = acpi_ds_create_walk_state (obj_desc->method.owning_id,
+       walk_state = acpi_ds_create_walk_state (obj_desc->method.owner_id,
                           NULL, NULL, NULL);
        if (!walk_state) {
                status = AE_NO_MEMORY;