From 17f11d85d69b3080a2a6c0e1c2da2f9ce7d6d5c6 Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Thu, 13 Nov 2008 10:51:49 +0800
Subject: [PATCH] --- yaml --- r: 128031 b: refs/heads/master c:
 5572a9859fa55216597b8226717691956d3e53e3 h: refs/heads/master i:   128029:
 c47877c05d17938ba540f87888e10574636321ec   128027:
 38341a65f838a410bd08304464f76ff964408935   128023:
 17ff34b08e0742f392ec2e3309df68ecc0fa49c0   128015:
 ebc3fff90106d951fa3293df403884090a68e167   127999:
 c3235cfcfeead2886fbe3590299afabe7ec72392 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/acpi/namespace/nsaccess.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 65b91190c2bd..33d686a8acb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 319f8b892722f289bb6e07b1067be3b2e0714238
+refs/heads/master: 5572a9859fa55216597b8226717691956d3e53e3
diff --git a/trunk/drivers/acpi/namespace/nsaccess.c b/trunk/drivers/acpi/namespace/nsaccess.c
index 29c7c271dbb8..35b0e46bd095 100644
--- a/trunk/drivers/acpi/namespace/nsaccess.c
+++ b/trunk/drivers/acpi/namespace/nsaccess.c
@@ -588,6 +588,10 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
 			 * segments).
 			 */
 			if (this_node->type == ACPI_TYPE_LOCAL_ALIAS) {
+				if (!this_node->object) {
+					return_ACPI_STATUS(AE_NOT_EXIST);
+				}
+
 				if (acpi_ns_opens_scope
 				    (((struct acpi_namespace_node *)this_node->
 				      object)->type)) {