aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/utils.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 371ac12d25b1..5512309d167b 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -347,22 +347,16 @@ acpi_evaluate_reference(acpi_handle handle,
347 package = buffer.pointer; 347 package = buffer.pointer;
348 348
349 if ((buffer.length == 0) || !package) { 349 if ((buffer.length == 0) || !package) {
350 printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
351 (unsigned)buffer.length, package);
352 status = AE_BAD_DATA; 350 status = AE_BAD_DATA;
353 acpi_util_eval_error(handle, pathname, status); 351 acpi_util_eval_error(handle, pathname, status);
354 goto end; 352 goto end;
355 } 353 }
356 if (package->type != ACPI_TYPE_PACKAGE) { 354 if (package->type != ACPI_TYPE_PACKAGE) {
357 printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
358 package->type);
359 status = AE_BAD_DATA; 355 status = AE_BAD_DATA;
360 acpi_util_eval_error(handle, pathname, status); 356 acpi_util_eval_error(handle, pathname, status);
361 goto end; 357 goto end;
362 } 358 }
363 if (!package->package.count) { 359 if (!package->package.count) {
364 printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
365 package);
366 status = AE_BAD_DATA; 360 status = AE_BAD_DATA;
367 acpi_util_eval_error(handle, pathname, status); 361 acpi_util_eval_error(handle, pathname, status);
368 goto end; 362 goto end;
@@ -381,17 +375,13 @@ acpi_evaluate_reference(acpi_handle handle,
381 375
382 if (element->type != ACPI_TYPE_LOCAL_REFERENCE) { 376 if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
383 status = AE_BAD_DATA; 377 status = AE_BAD_DATA;
384 printk(KERN_ERR PREFIX
385 "Expecting a [Reference] package element, found type %X\n",
386 element->type);
387 acpi_util_eval_error(handle, pathname, status); 378 acpi_util_eval_error(handle, pathname, status);
388 break; 379 break;
389 } 380 }
390 381
391 if (!element->reference.handle) { 382 if (!element->reference.handle) {
392 printk(KERN_WARNING PREFIX "Invalid reference in"
393 " package %s\n", pathname);
394 status = AE_NULL_ENTRY; 383 status = AE_NULL_ENTRY;
384 acpi_util_eval_error(handle, pathname, status);
395 break; 385 break;
396 } 386 }
397 /* Get the acpi_handle. */ 387 /* Get the acpi_handle. */