acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed

[karo-tx-linux.git] / drivers / acpi / acpi_memhotplug.c

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 62c2c74b5d9aa310eeb02175c4cba575c19eda5c..d97bb952a426ffd9fb9e115a917d5e54b6419ed3 100644 (file)
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -478,9 +478,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;
 }