This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / acpi / namespace / nsaccess.c

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 6cbe22f..765217b 100644 (file)
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -161,10 +161,8 @@ acpi_ns_root_initialize (void)
 
 #if defined (_ACPI_ASL_COMPILER) || defined (_ACPI_DUMP_App)
 
-                               /*
-                                * i_aSL Compiler cheats by putting parameter count
-                                * in the owner_iD
-                                */
+                               /* i_aSL Compiler cheats by putting parameter count in the owner_iD */
+
                                new_node->owner_id = obj_desc->method.param_count;
 #else
                                /* Mark this as a very SPECIAL method */
@@ -206,7 +204,6 @@ acpi_ns_root_initialize (void)
                                        status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT,
                                                         1, &obj_desc->mutex.semaphore);
                                        if (ACPI_FAILURE (status)) {
-                                               acpi_ut_remove_reference (obj_desc);
                                                goto unlock_and_exit;
                                        }
 
@@ -222,7 +219,6 @@ acpi_ns_root_initialize (void)
                                        status = acpi_os_create_semaphore (1, 1,
                                                           &obj_desc->mutex.semaphore);
                                        if (ACPI_FAILURE (status)) {
-                                               acpi_ut_remove_reference (obj_desc);
                                                goto unlock_and_exit;
                                        }
                                }
@@ -240,8 +236,7 @@ acpi_ns_root_initialize (void)
 
                        /* Store pointer to value descriptor in the Node */
 
-                       status = acpi_ns_attach_object (new_node, obj_desc,
-                                        ACPI_GET_OBJECT_TYPE (obj_desc));
+                       status = acpi_ns_attach_object (new_node, obj_desc, ACPI_GET_OBJECT_TYPE (obj_desc));
 
                        /* Remove local reference to the object */
 
@@ -467,8 +462,7 @@ acpi_ns_lookup (
                        type = this_node->type;
 
                        ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
-                               "Prefix-only Pathname (Zero name segments), Flags=%X\n",
-                               flags));
+                               "Prefix-only Pathname (Zero name segments), Flags=%X\n", flags));
                        break;
 
                case AML_DUAL_NAME_PREFIX:
@@ -560,7 +554,7 @@ acpi_ns_lookup (
                /* Try to find the single (4 character) ACPI name */
 
                status = acpi_ns_search_and_enter (simple_name, walk_state, current_node,
-                                interpreter_mode, this_search_type, local_flags, &this_node);
+                                 interpreter_mode, this_search_type, local_flags, &this_node);
                if (ACPI_FAILURE (status)) {
                        if (status == AE_NOT_FOUND) {
                                /* Name not found in ACPI namespace */