Merge branch 'dock' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:25:26 +0000 (23:25 -0400)
Conflicts:
drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
1  2 
MAINTAINERS
drivers/acpi/bus.c
drivers/acpi/osl.c
include/acpi/acpi_drivers.h

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -726,11 -743,19 +743,19 @@@ static acpi_status __acpi_os_execute(ac
        dpc->function = function;
        dpc->context = context;
  
-       INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-       queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq;
-       if (!queue_work(queue, &dpc->work)) {
+       if (!hp) {
+               INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+               queue = (type == OSL_NOTIFY_HANDLER) ?
+                       kacpi_notify_wq : kacpid_wq;
+               ret = queue_work(queue, &dpc->work);
+       } else {
+               INIT_WORK(&dpc->work, acpi_os_execute_hp_deferred);
+               ret = schedule_work(&dpc->work);
+       }
+       if (!ret) {
 -              ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -                        "Call to queue_work() failed.\n"));
 +              printk(KERN_ERR PREFIX
 +                        "Call to queue_work() failed.\n");
                status = AE_ERROR;
                kfree(dpc);
        }
Simple merge