Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[pandora-kernel.git] / drivers / acpi / acpica / evevent.c

diff --git a/drivers/acpi/acpica/evevent.c b/drivers/acpi/acpica/evevent.c
index 246f877..cd55c77 100644 (file)
--- a/drivers/acpi/acpica/evevent.c
+++ b/drivers/acpi/acpica/evevent.c
@@ -183,7 +183,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Install the fixed event handlers and enable the fixed events.
+ * DESCRIPTION: Install the fixed event handlers and disable all fixed events.
  *
  ******************************************************************************/
 
@@ -200,12 +200,13 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
                acpi_gbl_fixed_event_handlers[i].handler = NULL;
                acpi_gbl_fixed_event_handlers[i].context = NULL;
 
-               /* Enable the fixed event */
+               /* Disable the fixed event */
 
                if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) {
                        status =
                            acpi_write_bit_register(acpi_gbl_fixed_event_info
-                                                   [i].enable_register_id, 0);
+                                                   [i].enable_register_id,
+                                                   ACPI_DISABLE_EVENT);
                        if (ACPI_FAILURE(status)) {
                                return (status);
                        }
@@ -289,7 +290,7 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
        /* Clear the status bit */
 
        (void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
-                                     status_register_id, 1);
+                                     status_register_id, ACPI_CLEAR_STATUS);
 
        /*
         * Make sure we've got a handler. If not, report an error. The event is
@@ -297,7 +298,8 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
         */
        if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
                (void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
-                                             enable_register_id, 0);
+                                             enable_register_id,
+                                             ACPI_DISABLE_EVENT);
 
                ACPI_ERROR((AE_INFO,
                            "No installed handler for fixed event [%08X]",