aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpredef.h
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-11-12 22:01:34 -0500
committerLen Brown <len.brown@intel.com>2008-11-27 01:55:13 -0500
commit95a28ed08619cc70f31611886ac7b26ab0e462dc (patch)
tree4d57eb3126d211f14f129d3b79c2f48d2c725bcb /include/acpi/acpredef.h
parent0081b162023690877e0096ef17a82ba1969befa8 (diff)
ACPICA: Allow _WAK method to return an Integer
This can happen if the _WAK method returns nothing (as per ACPI 1.0) but does return an integer if the implicit return mechanism is enabled. This is the only method that has this problem, since it is also defined to return a package of two integers (ACPI 1.0b+). In all other cases, if a method returns an object when one was not expected, no warning is issued. 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 'include/acpi/acpredef.h')
-rw-r--r--include/acpi/acpredef.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpredef.h b/include/acpi/acpredef.h
index 619fb75f8861..e6452dbf39e3 100644
--- a/include/acpi/acpredef.h
+++ b/include/acpi/acpredef.h
@@ -346,7 +346,7 @@ static const union acpi_predefined_info predefined_names[] = {
346 346
347 /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */ 347 /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
348 348
349 {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_PACKAGE}}, 349 {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
350 {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* fixed (2 Int), but is optional */ 350 {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* fixed (2 Int), but is optional */
351 {.ret_info = {0, 0, 0, 0, 0, 0}} /* Table terminator */ 351 {.ret_info = {0, 0, 0, 0, 0, 0}} /* Table terminator */
352}; 352};