diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/scan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 6c83342d13d5..f2e283426be9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1222,14 +1222,10 @@ acpi_add_single_object(struct acpi_device **child, | |||
1222 | struct acpi_device *parent, acpi_handle handle, int type, | 1222 | struct acpi_device *parent, acpi_handle handle, int type, |
1223 | struct acpi_bus_ops *ops) | 1223 | struct acpi_bus_ops *ops) |
1224 | { | 1224 | { |
1225 | int result = 0; | 1225 | int result; |
1226 | struct acpi_device *device = NULL; | 1226 | struct acpi_device *device; |
1227 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 1227 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
1228 | 1228 | ||
1229 | |||
1230 | if (!child) | ||
1231 | return -EINVAL; | ||
1232 | |||
1233 | device = kzalloc(sizeof(struct acpi_device), GFP_KERNEL); | 1229 | device = kzalloc(sizeof(struct acpi_device), GFP_KERNEL); |
1234 | if (!device) { | 1230 | if (!device) { |
1235 | printk(KERN_ERR PREFIX "Memory allocation error\n"); | 1231 | printk(KERN_ERR PREFIX "Memory allocation error\n"); |