Skip to content

Commit

Permalink
ACPI: Attach the ACPI device to the ACPI handle as early as possible
Browse files Browse the repository at this point in the history
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 <yakui.zhao@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Zhao Yakui authored and Len Brown committed Oct 22, 2008
1 parent a51e145 commit eab4b64
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,16 @@ 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
* ----------------
Expand Down Expand Up @@ -1282,8 +1292,6 @@ 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);

Expand Down

0 comments on commit eab4b64

Please sign in to comment.