From f9d970d3e2bc1ba77a4d7ef9ee11eeb584d83bae Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Thu, 3 Sep 2009 09:55:40 +0800 Subject: [PATCH] --- yaml --- r: 165213 b: refs/heads/master c: 307a042416dfc2216251a85b79e8578b65fdc0e7 h: refs/heads/master i: 165211: ab148d3fdc65be1f57a616a89bc4661e7ae62a8b v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/nspredef.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f9cf4d10332..eaec75509d73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718fb0de8ff88f71b3b91a8ee8e42e60c88e5128 +refs/heads/master: 307a042416dfc2216251a85b79e8578b65fdc0e7 diff --git a/trunk/drivers/acpi/acpica/nspredef.c b/trunk/drivers/acpi/acpica/nspredef.c index 8314e6a9e726..f8427afeebdf 100644 --- a/trunk/drivers/acpi/acpica/nspredef.c +++ b/trunk/drivers/acpi/acpica/nspredef.c @@ -193,11 +193,15 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, } /* - * We have a return value, but if one wasn't expected, just exit, this is + * 1) We have a return value, but if one wasn't expected, just exit, this is * not a problem. For example, if the "Implicit Return" feature is * enabled, methods will always return a value. + * + * 2) If the return value can be of any type, then we cannot perform any + * validation, exit. */ - if (!predefined->info.expected_btypes) { + if ((!predefined->info.expected_btypes) || + (predefined->info.expected_btypes == ACPI_RTYPE_ALL)) { goto cleanup; }