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

Commit 1dbc1fda authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: suspend: Wrong order of GPE restore. 



acpi_leave_sleep_state() should have correct list of wake and
runtime GPEs, which is available only after disable_wakeup_device()
is called.

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9c1c6a1b

drivers/acpi/sleep/main.c

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ static void acpi_pm_finish(void) 
{

	u32 acpi_state = acpi_target_sleep_state;



	acpi_leave_sleep_state(acpi_state);

	acpi_disable_wakeup_device(acpi_state);

	acpi_leave_sleep_state(acpi_state);



	/* reset firmware waking vector */

	acpi_set_firmware_waking_vector((acpi_physical_address) 0);
@@ -272,8 +272,8 @@ static void acpi_hibernation_finish(void) 
	 * enable it here.

	 */

	acpi_enable();

	acpi_leave_sleep_state(ACPI_STATE_S4);

	acpi_disable_wakeup_device(ACPI_STATE_S4);

	acpi_leave_sleep_state(ACPI_STATE_S4);



	/* reset firmware waking vector */

	acpi_set_firmware_waking_vector((acpi_physical_address) 0);