diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:19:51 -0400 |
| commit | bcb631f31839cb7c7dd56ab534b6eb4867e9161b (patch) | |
| tree | d86336c9cfb22e4af69fbe73c94299a775ecc220 /drivers/acpi/osl.c | |
| parent | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (diff) | |
| parent | ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 (diff) | |
Merge branch 'acpica' into test
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 235a1386888a..1420a9f69e5d 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -729,8 +729,8 @@ acpi_status acpi_os_execute(acpi_execute_type type, | |||
| 729 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); | 729 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); |
| 730 | queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq; | 730 | queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq; |
| 731 | if (!queue_work(queue, &dpc->work)) { | 731 | if (!queue_work(queue, &dpc->work)) { |
| 732 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 732 | printk(KERN_ERR PREFIX |
| 733 | "Call to queue_work() failed.\n")); | 733 | "Call to queue_work() failed.\n"); |
| 734 | status = AE_ERROR; | 734 | status = AE_ERROR; |
| 735 | kfree(dpc); | 735 | kfree(dpc); |
| 736 | } | 736 | } |