[RESEND] [PATCH 1/4] ACPI: Attach the ACPI device to the ACPI handle as early as possible
From: Zhao Yakui <hidden>
Date: 2008-08-11 06:42:34
Subject:ACPI: Attach the ACPI device to the ACPI handle as early as possible From: Zhao Yakui <redacted> Attach the ACPI device to the ACPI handle as early as possible so that OS can get the corresponding ACPI device by the acpi handle in the course of getting the power/wakeup/performance flags. http://bugzilla.kernel.org/show_bug.cgi?id=8049 http://bugzilla.kernel.org/show_bug.cgi?id=11000 Signed-off-by: Zhao Yakui <redacted> Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- drivers/acpi/scan.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/acpi/scan.c ===================================================================
--- linux-2.6.orig/drivers/acpi/scan.c
+++ linux-2.6/drivers/acpi/scan.c@@ -1262,6 +1262,16 @@ 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 * ---------------- */
@@ -1291,8 +1301,6 @@ 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);