aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dsobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/dsobject.c')
-rw-r--r--drivers/acpi/acpica/dsobject.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 2beb7fd674ae..302c91f5377b 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -463,10 +463,10 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
463 arg->common.node); 463 arg->common.node);
464 } 464 }
465 } else { 465 } else {
466 status = acpi_ds_build_internal_object(walk_state, arg, 466 status =
467 &obj_desc-> 467 acpi_ds_build_internal_object(walk_state, arg,
468 package. 468 &obj_desc->package.
469 elements[i]); 469 elements[i]);
470 } 470 }
471 471
472 if (*obj_desc_ptr) { 472 if (*obj_desc_ptr) {
@@ -525,7 +525,8 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
525 } 525 }
526 526
527 ACPI_INFO((AE_INFO, 527 ACPI_INFO((AE_INFO,
528 "Actual Package length (%u) is larger than NumElements field (%u), truncated", 528 "Actual Package length (%u) is larger than "
529 "NumElements field (%u), truncated",
529 i, element_count)); 530 i, element_count));
530 } else if (i < element_count) { 531 } else if (i < element_count) {
531 /* 532 /*
@@ -533,7 +534,8 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
533 * Note: this is not an error, the package is padded out with NULLs. 534 * Note: this is not an error, the package is padded out with NULLs.
534 */ 535 */
535 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 536 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
536 "Package List length (%u) smaller than NumElements count (%u), padded with null elements\n", 537 "Package List length (%u) smaller than NumElements "
538 "count (%u), padded with null elements\n",
537 i, element_count)); 539 i, element_count));
538 } 540 }
539 541
@@ -584,8 +586,9 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
584 586
585 /* Build an internal object for the argument(s) */ 587 /* Build an internal object for the argument(s) */
586 588
587 status = acpi_ds_build_internal_object(walk_state, op->common.value.arg, 589 status =
588 &obj_desc); 590 acpi_ds_build_internal_object(walk_state, op->common.value.arg,
591 &obj_desc);
589 if (ACPI_FAILURE(status)) { 592 if (ACPI_FAILURE(status)) {
590 return_ACPI_STATUS(status); 593 return_ACPI_STATUS(status);
591 } 594 }