Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eab4b645 authored by Zhao Yakui's avatar Zhao Yakui Committed by Len Brown
Browse files

ACPI: Attach the ACPI device to the ACPI handle as early as possible 

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: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a51e145f

drivers/acpi/scan.c

+10 −2
Original line number Diff line number Diff line
@@ -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

	 * ----------------
@@ -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);