---

yaml --- r: 154175 b: refs/heads/master c: 8b12b92 h: refs/heads/master i: 154173: cd37e61 154171: 1f77361 154167: 3374a5f 154159: 646b20e 154143: 2e259b4 154111: 51a4ebf v: v3
git-mirror · Jun 18, 2009 · dced0a7 · dced0a7
1 parent fc02fac
commit dced0a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;
 	}