projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
acpi_memhotplug.c
diff --git
a/drivers/acpi/acpi_memhotplug.c
b/drivers/acpi/acpi_memhotplug.c
index 5e6301e949206adb9f9b512a4b44b9d093e588df..2cf0244d0ee9aa441001e4fbde5f094051313c7b 100644
(file)
--- a/
drivers/acpi/acpi_memhotplug.c
+++ b/
drivers/acpi/acpi_memhotplug.c
@@
-283,6
+283,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;
}