---

yaml --- r: 367578 b: refs/heads/master c: 02d4fb3 h: refs/heads/master v: v3
git-mirror · Mar 11, 2013 · a566f79 · a566f79
1 parent faad647
commit a566f79
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40411255c89eb382ed695933155a606c000d855e
+refs/heads/master: 02d4fb36867c33f7e0cec8d6e6dad47ad712a497
diff --git a/trunk/drivers/acpi/acpica/nsprepkg.c b/trunk/drivers/acpi/acpica/nsprepkg.c
@@ -112,9 +112,15 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
 	elements = return_object->package.elements;
 	count = return_object->package.count;
 
-	/* The package must have at least one element, else invalid */
-
+	/*
+	 * Most packages must have at least one element. The only exception
+	 * is the variable-length package (ACPI_PTYPE1_VAR).
+	 */
 	if (!count) {
+		if (package->ret_info.type == ACPI_PTYPE1_VAR) {
+			return (AE_OK);
+		}
+
 		ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
 				      "Return Package has no elements (empty)"));