Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)
  ACPI: fix early DSDT dmi check warnings on ia64
  ACPICA: Update version to 20100428.
  ACPICA: Update/clarify some parameter names associated with acpi_handle
  ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
  ACPICA: Prevent possible allocation overrun during object copy
  ACPICA: Split large file, evgpeblk
  ACPICA: Add GPE support for dynamically loaded ACPI tables
  ACPICA: Clarify/rename some root table descriptor fields
  ACPICA: Update version to 20100331.
  ACPICA: Minimize the differences between linux GPE code and ACPICA code base
  ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
  ACPICA: Update DSDT copy/detection.
  ACPICA: Add subsystem option to force copy of DSDT to local memory
  ACPICA: Add detection of corrupted/replaced DSDT
  ACPICA: Add write support for DataTable operation regions
  ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
  ACPICA: Update comments/headers, no functional change
  ACPICA: Update version to 20100304
  ACPICA: Fix for possible fault in acpi_ex_release_mutex
  ACPICA: Standardize integer output for ACPICA warnings/errors
  ...

1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index b40757955f9b..cc825023012a 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -142,7 +142,7 @@ acpi_install_fixed_event_handler(u32 event,
         if (ACPI_SUCCESS(status))
                 status = acpi_enable_event(event, 0);
         if (ACPI_FAILURE(status)) {
-                ACPI_WARNING((AE_INFO, "Could not enable fixed event %X",
+                ACPI_WARNING((AE_INFO, "Could not enable fixed event 0x%X",
                               event));
 
                 /* Remove the handler */
@@ -203,7 +203,7 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
 
         if (ACPI_FAILURE(status)) {
                 ACPI_WARNING((AE_INFO,
-                              "Could not write to fixed event enable register %X",
+                              "Could not write to fixed event enable register 0x%X",
                               event));
         } else {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
@@ -682,14 +682,13 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         /* Parameter validation */
 
-        if ((!address) || (type > ACPI_GPE_XRUPT_TYPE_MASK)) {
-                status = AE_BAD_PARAMETER;
-                goto exit;
+        if ((!address) || (type & ~ACPI_GPE_XRUPT_TYPE_MASK)) {
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
-                goto exit;
+                return_ACPI_STATUS(status);
         }
 
         /* Ensure that we have a valid GPE number */
@@ -720,6 +719,13 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
 
+        /* Disable the GPE before installing the handler */
+
+        status = acpi_ev_disable_gpe(gpe_event_info);
+        if (ACPI_FAILURE (status)) {
+                goto unlock_and_exit;
+        }
+
         /* Install the handler */
 
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
@@ -733,12 +739,8 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
 
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
 
-      unlock_and_exit:
+unlock_and_exit:
         (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
-      exit:
-        if (ACPI_FAILURE(status))
-                ACPI_EXCEPTION((AE_INFO, status,
-                                "Installing notify handler failed"));
         return_ACPI_STATUS(status);
 }