X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Facpi%2Facpi_memhotplug.c;h=999adb5499c7270626466a7d74870531c3e3ae28;hb=521a87cdaece333cb2b89dd6393613119af5a431;hp=c711d1144044ec18b47a8aad9f0c0f43e5f5f690;hpb=4824b69a928b6609cfb1cf232ef32d4a8125a371;p=~andy%2Flinux

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index c711d114404..999adb5499c 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -323,6 +323,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
 	/* Get the range from the _CRS */
 	result = acpi_memory_get_device_resources(mem_device);
 	if (result) {
+		device->driver_data = NULL;
 		kfree(mem_device);
 		return result;
 	}