1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 308ddb1c207c..ad0679843bd5 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1253,6 +1253,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);