diff options
Diffstat (limited to 'drivers/acpi/processor_thermal.c')
-rw-r--r-- | drivers/acpi/processor_thermal.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index f99ad05cd6a2..c2095ab7f0dd 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
@@ -82,7 +82,7 @@ static int acpi_processor_apply_limit(struct acpi_processor *pr) | |||
82 | 82 | ||
83 | end: | 83 | end: |
84 | if (result) | 84 | if (result) |
85 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to set limit\n")); | 85 | ACPI_ERROR((AE_INFO, "Unable to set limit")); |
86 | 86 | ||
87 | return_VALUE(result); | 87 | return_VALUE(result); |
88 | } | 88 | } |
@@ -289,8 +289,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type) | |||
289 | 289 | ||
290 | result = acpi_processor_apply_limit(pr); | 290 | result = acpi_processor_apply_limit(pr); |
291 | if (result) | 291 | if (result) |
292 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 292 | ACPI_ERROR((AE_INFO, "Unable to set thermal limit")); |
293 | "Unable to set thermal limit\n")); | ||
294 | 293 | ||
295 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n", | 294 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n", |
296 | pr->limit.thermal.px, pr->limit.thermal.tx)); | 295 | pr->limit.thermal.px, pr->limit.thermal.tx)); |
@@ -362,25 +361,23 @@ static ssize_t acpi_processor_write_limit(struct file * file, | |||
362 | ACPI_FUNCTION_TRACE("acpi_processor_write_limit"); | 361 | ACPI_FUNCTION_TRACE("acpi_processor_write_limit"); |
363 | 362 | ||
364 | if (!pr || (count > sizeof(limit_string) - 1)) { | 363 | if (!pr || (count > sizeof(limit_string) - 1)) { |
365 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n")); | ||
366 | return_VALUE(-EINVAL); | 364 | return_VALUE(-EINVAL); |
367 | } | 365 | } |
368 | 366 | ||
369 | if (copy_from_user(limit_string, buffer, count)) { | 367 | if (copy_from_user(limit_string, buffer, count)) { |
370 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data\n")); | ||
371 | return_VALUE(-EFAULT); | 368 | return_VALUE(-EFAULT); |
372 | } | 369 | } |
373 | 370 | ||
374 | limit_string[count] = '\0'; | 371 | limit_string[count] = '\0'; |
375 | 372 | ||
376 | if (sscanf(limit_string, "%d:%d", &px, &tx) != 2) { | 373 | if (sscanf(limit_string, "%d:%d", &px, &tx) != 2) { |
377 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data format\n")); | 374 | ACPI_ERROR((AE_INFO, "Invalid data format")); |
378 | return_VALUE(-EINVAL); | 375 | return_VALUE(-EINVAL); |
379 | } | 376 | } |
380 | 377 | ||
381 | if (pr->flags.throttling) { | 378 | if (pr->flags.throttling) { |
382 | if ((tx < 0) || (tx > (pr->throttling.state_count - 1))) { | 379 | if ((tx < 0) || (tx > (pr->throttling.state_count - 1))) { |
383 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid tx\n")); | 380 | ACPI_ERROR((AE_INFO, "Invalid tx")); |
384 | return_VALUE(-EINVAL); | 381 | return_VALUE(-EINVAL); |
385 | } | 382 | } |
386 | pr->limit.user.tx = tx; | 383 | pr->limit.user.tx = tx; |