diff options
| author | Bob Moore <robert.moore@intel.com> | 2014-02-26 10:30:43 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-27 00:46:00 +0100 |
| commit | 69e6bb6898df3589bde7655aae26e254792a2d80 (patch) | |
| tree | b243f76ed61c37c2b586c6071def01f0cbec95a3 | |
| parent | 1c3c2a545dc06e606c6cbbcb7ab722bf3b2cb668 (diff) | |
| download | linux-stable-69e6bb6898df3589bde7655aae26e254792a2d80.tar.gz linux-stable-69e6bb6898df3589bde7655aae26e254792a2d80.tar.bz2 linux-stable-69e6bb6898df3589bde7655aae26e254792a2d80.zip | |
ACPICA: Do not abort _PRT repair on a single subpackage failure.
Always examine all subpackages for reversed entries.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -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, top_object_list = package_object->package.elements; element_count = package_object->package.count; - for (index = 0; index < element_count; index++) { + /* Examine each subpackage */ + + for (index = 0; index < element_count; index++, top_object_list++) { sub_package = *top_object_list; sub_object_list = sub_package->package.elements; - if (sub_package->package.count < 4) { /* Minimum required element count */ - return (AE_OK); + /* Check for minimum required element count */ + + if (sub_package->package.count < 4) { + continue; } /* @@ -640,15 +644,12 @@ acpi_ns_repair_PRT(struct acpi_evaluate_info *info, sub_object_list[2] = obj_desc; info->return_flags |= ACPI_OBJECT_REPAIRED; - ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, + ACPI_WARN_PREDEFINED((AE_INFO, + info->full_pathname, info->node_flags, "PRT[%X]: Fixed reversed SourceName and SourceIndex", index)); } - - /* Point to the next union acpi_operand_object in the top level package */ - - top_object_list++; } return (AE_OK); |