---

yaml --- r: 336685 b: refs/heads/master c: e0b7b24 h: refs/heads/master i: 336683: 159c063 v: v3
git-mirror · Nov 16, 2012 · c7870aa · c7870aa
1 parent 48e0a5f
commit c7870aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 }