Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / acpi / acpica / evmisc.c

diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c
index 5f893057bcc617909cb08294089e6f0e98f9dc53..ce224e1eaa895eb9e55946351d2b9413780c647e 100644 (file)
--- a/drivers/acpi/acpica/evmisc.c
+++ b/drivers/acpi/acpica/evmisc.c
@@ -163,10 +163,10 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
         * 2) Global device notify handler
         * 3) Per-device notify handler
         */
-       if ((acpi_gbl_system_notify.handler
-            && (notify_value <= ACPI_MAX_SYS_NOTIFY))
-           || (acpi_gbl_device_notify.handler
-               && (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {
+       if ((acpi_gbl_system_notify.handler &&
+            (notify_value <= ACPI_MAX_SYS_NOTIFY)) ||
+           (acpi_gbl_device_notify.handler &&
+            (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {
                notify_info = acpi_ut_create_generic_state();
                if (!notify_info) {
                        return (AE_NO_MEMORY);
@@ -174,7 +174,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
 
                if (!handler_obj) {
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "Executing system notify handler for Notify (%4.4s, %X) node %p\n",
+                                         "Executing system notify handler for Notify (%4.4s, %X) "
+                                         "node %p\n",
                                          acpi_ut_get_node_name(node),
                                          notify_value, node));
                }
@@ -534,8 +535,9 @@ acpi_status acpi_ev_release_global_lock(void)
                 */
                if (pending) {
                        status =
-                           acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,
-                                             1);
+                           acpi_write_bit_register
+                           (ACPI_BITREG_GLOBAL_LOCK_RELEASE,
+                            ACPI_ENABLE_EVENT);
                }
 
                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,