Messages in this thread Patch in this message | | | Date | Fri, 06 Nov 2009 13:56:16 -0800 | From | Greg KH <> | Subject | [13/30] Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible" |
| |
2.6.29-stable review patch. If anyone has any objections, please let us know.
------------------ From: Len Brown <len.brown@intel.com>
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>
--- drivers/acpi/scan.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
--- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1262,16 +1262,6 @@ acpi_add_single_object(struct acpi_devic 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_devic goto end; } + if ((result = acpi_device_set_context(device, type))) + goto end; result = acpi_device_register(device, parent);
| |