diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-05 13:33:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-05 13:33:23 -0400 |
| commit | f61f925859c57f6175082aeeee17743c68558a6e (patch) | |
| tree | bc97abc969d6b12ce157e4d5d1be8ad7b620c9f7 /drivers | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.
http://bugzilla.kernel.org/show_bug.cgi?id=13002
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/scan.c | 12 |
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); |