From b665a579fbfe1407da22e665b63a9aa2f5335ab9 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 21 Sep 2009 19:29:30 +0000 Subject: [PATCH] --- yaml --- r: 166380 b: refs/heads/master c: 77c24888b7693eecee904308e0ee51f7f1f564df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 06b596270c9c..f521203b0899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7bcb4e98aca348f6f8ab432496ff35ba7a49a1d +refs/heads/master: 77c24888b7693eecee904308e0ee51f7f1f564df diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 6c83342d13d5..f2e283426be9 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -1222,14 +1222,10 @@ acpi_add_single_object(struct acpi_device **child, struct acpi_device *parent, acpi_handle handle, int type, struct acpi_bus_ops *ops) { - int result = 0; - struct acpi_device *device = NULL; + int result; + struct acpi_device *device; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - - if (!child) - return -EINVAL; - device = kzalloc(sizeof(struct acpi_device), GFP_KERNEL); if (!device) { printk(KERN_ERR PREFIX "Memory allocation error\n");