mirror of
https://github.com/genesi/linux-legacy.git
synced 2026-02-04 08:15:11 +00:00
Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
commit f61f925859c57f6175082aeeee17743c68558a6e upstream.
This reverts commit eab4b64576.
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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5621e89d8b
commit
3c802f7827
@@ -1263,16 +1263,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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user