diff options
| -rw-r--r-- | drivers/acpi/acpica/nsrepair2.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c index c57cd4aa357d..18012140de1f 100644 --- a/drivers/acpi/acpica/nsrepair2.c +++ b/drivers/acpi/acpica/nsrepair2.c | |||
| @@ -620,12 +620,16 @@ acpi_ns_repair_PRT(struct acpi_evaluate_info *info, | |||
| 620 | top_object_list = package_object->package.elements; | 620 | top_object_list = package_object->package.elements; |
| 621 | element_count = package_object->package.count; | 621 | element_count = package_object->package.count; |
| 622 | 622 | ||
| 623 | for (index = 0; index < element_count; index++) { | 623 | /* Examine each subpackage */ |
| 624 | |||
| 625 | for (index = 0; index < element_count; index++, top_object_list++) { | ||
| 624 | sub_package = *top_object_list; | 626 | sub_package = *top_object_list; |
| 625 | sub_object_list = sub_package->package.elements; | 627 | sub_object_list = sub_package->package.elements; |
| 626 | 628 | ||
| 627 | if (sub_package->package.count < 4) { /* Minimum required element count */ | 629 | /* Check for minimum required element count */ |
| 628 | return (AE_OK); | 630 | |
| 631 | if (sub_package->package.count < 4) { | ||
| 632 | continue; | ||
| 629 | } | 633 | } |
| 630 | 634 | ||
| 631 | /* | 635 | /* |
| @@ -640,15 +644,12 @@ acpi_ns_repair_PRT(struct acpi_evaluate_info *info, | |||
| 640 | sub_object_list[2] = obj_desc; | 644 | sub_object_list[2] = obj_desc; |
| 641 | info->return_flags |= ACPI_OBJECT_REPAIRED; | 645 | info->return_flags |= ACPI_OBJECT_REPAIRED; |
| 642 | 646 | ||
| 643 | ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, | 647 | ACPI_WARN_PREDEFINED((AE_INFO, |
| 648 | info->full_pathname, | ||
| 644 | info->node_flags, | 649 | info->node_flags, |
| 645 | "PRT[%X]: Fixed reversed SourceName and SourceIndex", | 650 | "PRT[%X]: Fixed reversed SourceName and SourceIndex", |
| 646 | index)); | 651 | index)); |
| 647 | } | 652 | } |
| 648 | |||
| 649 | /* Point to the next union acpi_operand_object in the top level package */ | ||
| 650 | |||
| 651 | top_object_list++; | ||
| 652 | } | 653 | } |
| 653 | 654 | ||
| 654 | return (AE_OK); | 655 | return (AE_OK); |
