From dced0a757d4f6d054c1ce86826bf4b90a2812da3 Mon Sep 17 00:00:00 2001 From: Alex Chiang Date: Thu, 14 May 2009 08:31:32 -0600 Subject: [PATCH] --- yaml --- r: 154175 b: refs/heads/master c: 8b12b922ed5b9b6bfc345d3d6c6de56b2982af7f h: refs/heads/master i: 154173: cd37e61ea56f9cf1cb10f12858022b3c758c7b44 154171: 1f773611a2557510730e496e62f430927cb15503 154167: 3374a5f15bea67862f303c4b3a1df8354e51ce7e 154159: 646b20e60dcbc6c5b6d167b2f7c944e9150f8375 154143: 2e259b49cfa3b7a07e19d8f8df03bf0370d1a066 154111: 51a4ebf1ce62f2681a7a73c1373fd125a609a339 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f55858c2e594..48cab5906ba1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab46feae865c5b96dbf5e261be8638165932bfb1 +refs/heads/master: 8b12b922ed5b9b6bfc345d3d6c6de56b2982af7f diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 8ff510b91d88..b8f5c005fbb5 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -530,11 +530,10 @@ static int acpi_device_register(struct acpi_device *device, if (device->parent) device->dev.parent = &parent->dev; device->dev.bus = &acpi_bus_type; - device_initialize(&device->dev); device->dev.release = &acpi_device_release; - result = device_add(&device->dev); + result = device_register(&device->dev); if(result) { - dev_err(&device->dev, "Error adding device\n"); + dev_err(&device->dev, "Error registering device\n"); goto end; }