1 files changed, 17 insertions, 7 deletions

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 34f157571080..44ea60cf21c0 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -36,16 +36,20 @@ ACPI_MODULE_NAME("utils");
 /* --------------------------------------------------------------------------
                             Object Evaluation Helpers
    -------------------------------------------------------------------------- */
+static void
+acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
+{
 #ifdef ACPI_DEBUG_OUTPUT
-#define acpi_util_eval_error(h,p,s) {\
-        char prefix[80] = {'\0'};\
-        struct acpi_buffer buffer = {sizeof(prefix), prefix};\
-        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",\
-                (char *) prefix, p, acpi_format_exception(s))); }
+        char prefix[80] = {'\0'};
+        struct acpi_buffer buffer = {sizeof(prefix), prefix};
+        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",
+                (char *) prefix, p, acpi_format_exception(s)));
 #else
-#define acpi_util_eval_error(h,p,s)
+        return;
 #endif
+}
+
 acpi_status
 acpi_extract_package(union acpi_object *package,
                      struct acpi_buffer *format, struct acpi_buffer *buffer)
@@ -403,6 +407,12 @@ acpi_evaluate_reference(acpi_handle handle,
                         break;
                 }
 
+                if (!element->reference.handle) {
+                        printk(KERN_WARNING PREFIX "Invalid reference in"
+                               " package %s\n", pathname);
+                        status = AE_NULL_ENTRY;
+                        break;
+                }
                 /* Get the  acpi_handle. */
 
                 list->handles[i] = element->reference.handle;