Commit 95a28ed0 authored Nov 13, 2008 by Bob Moore Committed by Len Brown Nov 27, 2008

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>

parent 0081b162

include/acpi/acpredef.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -346,7 +346,7 @@ static const union acpi_predefined_info predefined_names[] = {

		/* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */

		{.info = {"_WAK", 1, ACPI_RTYPE_NONE \| ACPI_RTYPE_PACKAGE}},
		{.info = {"_WAK", 1, ACPI_RTYPE_NONE \| ACPI_RTYPE_INTEGER \| ACPI_RTYPE_PACKAGE}},
		{.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* fixed (2 Int), but is optional */
		{.ret_info = {0, 0, 0, 0, 0, 0}} /* Table terminator */
		};

Admin message