diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8ff510b91d88..b8f5c005fbb5 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -530,11 +530,10 @@ static int acpi_device_register(struct acpi_device *device, | |||
530 | if (device->parent) | 530 | if (device->parent) |
531 | device->dev.parent = &parent->dev; | 531 | device->dev.parent = &parent->dev; |
532 | device->dev.bus = &acpi_bus_type; | 532 | device->dev.bus = &acpi_bus_type; |
533 | device_initialize(&device->dev); | ||
534 | device->dev.release = &acpi_device_release; | 533 | device->dev.release = &acpi_device_release; |
535 | result = device_add(&device->dev); | 534 | result = device_register(&device->dev); |
536 | if(result) { | 535 | if(result) { |
537 | dev_err(&device->dev, "Error adding device\n"); | 536 | dev_err(&device->dev, "Error registering device\n"); |
538 | goto end; | 537 | goto end; |
539 | } | 538 | } |
540 | 539 | ||