Merge branch 'bugzilla-13002' into release

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d7e369..5dd702c9c1fa 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1264,16 +1264,6 @@ 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
          * ----------------
          */
@@ -1303,6 +1293,8 @@ 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);