From a566f7944b80581ce7e9a033b0e7838f8425190a Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Fri, 8 Mar 2013 09:23:51 +0000
Subject: [PATCH] --- yaml --- r: 367578 b: refs/heads/master c:
 02d4fb36867c33f7e0cec8d6e6dad47ad712a497 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/acpi/acpica/nsprepkg.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6cc2672e7015..7da5e34ef45d 100644
--- 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
index a40155467d2e..77cdd539de16 100644
--- 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)"));