Commit e0b7b24d authored Nov 16, 2012 by Wen Congyang Committed by Rafael J. Wysocki Nov 16, 2012

ACPI / memhotplug: free memory device if acpi_memory_enable_device() failed



If acpi_memory_enable_device() fails, acpi_memory_enable_device() will
return a non-zero value, which means we fail to bind the memory device to
this driver.  So we should free memory device before
acpi_memory_device_add() returns.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 386e52b9

drivers/acpi/acpi_memhotplug.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}