---

yaml
---
r: 117282
b: refs/heads/master
c: eab4b64
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a51e145f379ae48003129610922595893e8efde0
+refs/heads/master: eab4b645769fa2f8703f5a3cb0cc4ac090d347af

trunk/drivers/acpi/scan.c

@@ -1252,6 +1252,16 @@ acpi_add_single_object(struct acpi_device **child,
 	 */
 	acpi_device_set_id(device, parent, handle, type);
 
+	/*
+	 * The ACPI device is attached to acpi handle before getting
+	 * the power/wakeup/peformance flags. Otherwise OS can't get
+	 * the corresponding ACPI device by the acpi handle in the course
+	 * of getting the power/wakeup/performance flags.
+	 */
+	result = acpi_device_set_context(device, type);
+	if (result)
+		goto end;
+
 	/*
 	 * Power Management
 	 * ----------------
@@ -1282,8 +1292,6 @@ acpi_add_single_object(struct acpi_device **child,
 			goto end;
 	}
 
-	if ((result = acpi_device_set_context(device, type)))
-		goto end;
 
 	result = acpi_device_register(device, parent);