patch-2.4.14 linux/drivers/acpi/utilities/utxface.c

• Lines: 67
• Date: Wed Oct 24 14:06:22 2001
• Orig file: v2.4.13/linux/drivers/acpi/utilities/utxface.c
• Orig date: Sun Sep 23 11:40:57 2001

diff -u --recursive --new-file v2.4.13/linux/drivers/acpi/utilities/utxface.c linux/drivers/acpi/utilities/utxface.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: utxface - External interfaces for "global" ACPI functions
- *              $Revision: 80 $
+ *              $Revision: 82 $
  *
  *****************************************************************************/
 
@@ -240,19 +240,9 @@
 acpi_status
 acpi_terminate (void)
 {
-	acpi_status             status;
-
-
 	FUNCTION_TRACE ("Acpi_terminate");
 
 
-	/* Ensure that ACPI has been initialized */
-
-	ACPI_IS_INITIALIZATION_COMPLETE (status);
-	if (ACPI_FAILURE (status)) {
-		return_ACPI_STATUS (status);
-	}
-
 	/* Terminate the AML Debugger if present */
 
 	DEBUGGER_EXEC(acpi_gbl_db_terminate_threads = TRUE);
@@ -271,10 +261,18 @@
 	acpi_ut_mutex_terminate ();
 
 
+#ifdef ENABLE_DEBUGGER
+
+	/* Shut down the debugger */
+
+	acpi_db_terminate ();
+#endif
+
 	/* Now we can shutdown the OS-dependent layer */
 
 	acpi_os_terminate ();
 
+
 	return_ACPI_STATUS (AE_OK);
 }
 
@@ -330,18 +328,10 @@
 {
 	acpi_system_info        *info_ptr;
 	u32                     i;
-	acpi_status             status;
 
 
 	FUNCTION_TRACE ("Acpi_get_system_info");
 
-
-	/* Ensure that ACPI has been initialized */
-
-	ACPI_IS_INITIALIZATION_COMPLETE (status);
-	if (ACPI_FAILURE (status)) {
-		return_ACPI_STATUS (status);
-	}
 
 	/*
 	 *  Must have a valid buffer