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