From c7870aa27004a643265b02d2caa2c2f634c63050 Mon Sep 17 00:00:00 2001
From: Wen Congyang <wency@cn.fujitsu.com>
Date: Fri, 16 Nov 2012 02:08:16 +0100
Subject: [PATCH] --- yaml --- r: 336685 b: refs/heads/master c:
 e0b7b24dd9559fcda0f8bfd6acbcad81682c4fdd h: refs/heads/master i:   336683:
 159c0636f297be7b22d3d1c627afa256da610367 v: v3

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

diff --git a/[refs] b/[refs]
index e9c42dba1df4..19a0d0af4d8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 386e52b95550db87c93455e3c0efe3cc4543f036
+refs/heads/master: e0b7b24dd9559fcda0f8bfd6acbcad81682c4fdd
diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c
index c5e7b6d08ef3..e52ad5d3792d 100644
--- a/trunk/drivers/acpi/acpi_memhotplug.c
+++ b/trunk/drivers/acpi/acpi_memhotplug.c
@@ -421,9 +421,11 @@ static int acpi_memory_device_add(struct acpi_device *device)
 	if (!acpi_memory_check_device(mem_device)) {
 		/* call add_memory func */
 		result = acpi_memory_enable_device(mem_device);
-		if (result)
+		if (result) {
 			printk(KERN_ERR PREFIX
 				"Error in acpi_memory_enable_device\n");
+			acpi_memory_device_free(mem_device);
+		}
 	}
 	return result;
 }