summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nspredef.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2009-12-11 14:53:11 +0800
committerLen Brown <len.brown@intel.com>2009-12-15 17:29:35 -0500
commit34c39c755347c1ca3d06284bad2273c6a9c3108a (patch)
tree3e46f996ff85a9888162cde30dc7b12749cd156c /drivers/acpi/acpica/nspredef.c
parentebdca3edd5ac61e37f2f5e7c11006c1a68d3cc7e (diff)
ACPICA: Add repair for bad _FDE/_GTM buffers
The expected return value for both names is a Buffer of 5 DWORDS. This repair fixes two possible problems (both seen in the field): A package of integers is returned, or a buffer of BYTEs is returned. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nspredef.c')
-rw-r--r--drivers/acpi/acpica/nspredef.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index b05f42903c8..1782c3d85ba 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -222,23 +222,21 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
status = acpi_ns_check_object_type(data, return_object_ptr,
predefined->info.expected_btypes,
ACPI_NOT_PACKAGE_ELEMENT);
- if (ACPI_FAILURE(status)) {
- goto check_validation_status;
- }
+ if (ACPI_SUCCESS(status)) {
- /* For returned Package objects, check the type of all sub-objects */
+ /* For returned Package objects, check the type of all sub-objects */
- if (return_object->common.type == ACPI_TYPE_PACKAGE) {
- status = acpi_ns_check_package(data, return_object_ptr);
+ if (return_object->common.type == ACPI_TYPE_PACKAGE) {
+ status = acpi_ns_check_package(data, return_object_ptr);
+ }
}
/*
* Perform additional, more complicated repairs on a per-name
- * basis.
+ * basis. Do this regardless of the status from above.
*/
status = acpi_ns_complex_repairs(data, node, status, return_object_ptr);
-check_validation_status:
/*
* If the object validation failed or if we successfully repaired one
* or more objects, mark the parent node to suppress further warning