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

Commit f61f9258 authored by Len Brown's avatar Len Brown
Browse files

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

This reverts commit eab4b645.

http://bugzilla.kernel.org/show_bug.cgi?id=13002



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 37d0892c

drivers/acpi/scan.c

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