aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r--drivers/acpi/osl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 1bb558adee66..740a3c414898 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -137,6 +137,7 @@ void acpi_os_vprintf(const char *fmt, va_list args)
137#endif 137#endif
138} 138}
139 139
140
140extern int acpi_in_resume; 141extern int acpi_in_resume;
141void *acpi_os_allocate(acpi_size size) 142void *acpi_os_allocate(acpi_size size)
142{ 143{
@@ -590,7 +591,7 @@ static void acpi_os_execute_deferred(void *context)
590 591
591 dpc = (struct acpi_os_dpc *)context; 592 dpc = (struct acpi_os_dpc *)context;
592 if (!dpc) { 593 if (!dpc) {
593 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid (NULL) context.\n")); 594 ACPI_ERROR((AE_INFO, "Invalid (NULL) context"));
594 return_VOID; 595 return_VOID;
595 } 596 }
596 597
@@ -839,13 +840,13 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
839 } 840 }
840 841
841 if (ACPI_FAILURE(status)) { 842 if (ACPI_FAILURE(status)) {
842 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 843 ACPI_EXCEPTION((AE_INFO, status,
843 "Failed to acquire semaphore[%p|%d|%d], %s\n", 844 "Failed to acquire semaphore[%p|%d|%d], %s",
844 handle, units, timeout, 845 handle, units, timeout,
845 acpi_format_exception(status))); 846 acpi_format_exception(status)));
846 } else { 847 } else {
847 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, 848 ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
848 "Acquired semaphore[%p|%d|%d]\n", handle, 849 "Acquired semaphore[%p|%d|%d]", handle,
849 units, timeout)); 850 units, timeout));
850 } 851 }
851 852