Pull suspend into release branch (a3a1b26e) · Commits · e / devices / android_kernel_teracube_2e

drivers/acpi/hardware/hwsleep.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -576,13 +576,10 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
		ACPI_EXCEPTION((AE_INFO, status, "During Method _BFS"));
		}

		status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
		if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
		}
		/* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */

		/*
		* GPEs must be enabled before _WAK is called as GPEs
		* might get fired there
		*
		* Restore the GPEs:
		* 1) Disable/Clear all GPEs
		* 2) Enable all runtime GPEs
		@@ -591,13 +588,19 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}
		acpi_gbl_system_awake_and_running = TRUE;

		status = acpi_hw_enable_all_runtime_gpes();
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}

		status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
		if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
		}
		/* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */

		acpi_gbl_system_awake_and_running = TRUE;

		/* Enable power button */

		(void)