diff options
author | Thomas Renninger <trenn@suse.de> | 2006-06-26 23:58:43 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-26 23:58:43 -0400 |
commit | a6fc67202e0224e6c9d1d285cc0b444bce887ed5 (patch) | |
tree | cb2d422f65c0ab0a95f452f6bac80e2bfdd547de /drivers/acpi/scan.c | |
parent | eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 (diff) |
ACPI: Enable ACPI error messages w/o CONFIG_ACPI_DEBUG
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index f8316a05ede7..964ee5c8ea16 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -311,15 +311,14 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | |||
311 | /* _PRW */ | 311 | /* _PRW */ |
312 | status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer); | 312 | status = acpi_evaluate_object(device->handle, "_PRW", NULL, &buffer); |
313 | if (ACPI_FAILURE(status)) { | 313 | if (ACPI_FAILURE(status)) { |
314 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _PRW\n")); | 314 | ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRW")); |
315 | goto end; | 315 | goto end; |
316 | } | 316 | } |
317 | 317 | ||
318 | package = (union acpi_object *)buffer.pointer; | 318 | package = (union acpi_object *)buffer.pointer; |
319 | status = acpi_bus_extract_wakeup_device_power_package(device, package); | 319 | status = acpi_bus_extract_wakeup_device_power_package(device, package); |
320 | if (ACPI_FAILURE(status)) { | 320 | if (ACPI_FAILURE(status)) { |
321 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 321 | ACPI_EXCEPTION((AE_INFO, status, "Extracting _PRW package")); |
322 | "Error extracting _PRW package\n")); | ||
323 | goto end; | 322 | goto end; |
324 | } | 323 | } |
325 | 324 | ||
@@ -970,7 +969,7 @@ acpi_add_single_object(struct acpi_device **child, | |||
970 | 969 | ||
971 | device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL); | 970 | device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL); |
972 | if (!device) { | 971 | if (!device) { |
973 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Memory allocation error\n")); | 972 | ACPI_ERROR((AE_INFO, "Memory allocation error")); |
974 | return_VALUE(-ENOMEM); | 973 | return_VALUE(-ENOMEM); |
975 | } | 974 | } |
976 | memset(device, 0, sizeof(struct acpi_device)); | 975 | memset(device, 0, sizeof(struct acpi_device)); |