diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-05 13:33:23 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-09 16:52:17 -0800 |
| commit | 36a6ff74c7e6e20ac00dfe8432fddc37febfaee1 (patch) | |
| tree | 6243fd60873284dcc999ea3bafdc62c6d485ba22 | |
| parent | 466bf8f200f6586eff838566e6e40dbc448dd8e4 (diff) | |
Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
commit f61f925859c57f6175082aeeee17743c68558a6e upstream.
This reverts commit eab4b645769fa2f8703f5a3cb0cc4ac090d347af.
http://bugzilla.kernel.org/show_bug.cgi?id=13002
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 afa66f40d31..0450761c342 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1262,16 +1262,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 * ---------------- */ @@ -1301,6 +1291,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); |