---

yaml --- r: 350841 b: refs/heads/master c: abe9921 h: refs/heads/master i: 350839: e212871 v: v3
git-mirror · Jan 11, 2013 · f82e756 · f82e756
1 parent 074c87f
commit f82e756
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f95988de06ea62ef5bd861f06e9ef56cea405ed1
+refs/heads/master: abe99210e0f624cea39f1dc375ba818b201c0d7f
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
@@ -1593,7 +1593,7 @@ static acpi_status acpi_bus_device_attach(acpi_handle handle, u32 lvl_not_used,
 	if (!acpi_match_device_ids(device, acpi_platform_device_ids)) {
 		/* This is a known good platform device. */
 		acpi_create_platform_device(device);
-	} else if (device_attach(&device->dev)) {
+	} else if (device_attach(&device->dev) < 0) {
 		status = AE_CTRL_DEPTH;
 	}
 	return status;