From e371a6eaa749d326de14e64e43db89c30a8cedbf Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Sat, 27 Sep 2008 11:12:36 +0800
Subject: [PATCH] --- yaml --- r: 117314 b: refs/heads/master c:
 393a75d6b7bae59221b2122634eb4cb905e84208 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/acpi/namespace/nsnames.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47854608c16e..b75d82e4de59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1044f1f65b7df2aae979e397904c4985eeb99ba2
+refs/heads/master: 393a75d6b7bae59221b2122634eb4cb905e84208
diff --git a/trunk/drivers/acpi/namespace/nsnames.c b/trunk/drivers/acpi/namespace/nsnames.c
index bd5773878009..9c587bdfe3f3 100644
--- a/trunk/drivers/acpi/namespace/nsnames.c
+++ b/trunk/drivers/acpi/namespace/nsnames.c
@@ -142,7 +142,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
 	size = acpi_ns_get_pathname_length(node);
 	if (!size) {
-		return (NULL);
+		return_PTR(NULL);
 	}
 
 	/* Allocate a buffer to be returned to caller */
@@ -157,7 +157,8 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
 	status = acpi_ns_build_external_path(node, size, name_buffer);
 	if (ACPI_FAILURE(status)) {
-		return (NULL);
+		ACPI_FREE(name_buffer);
+		return_PTR(NULL);
 	}
 
 	return_PTR(name_buffer);