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

Commit 5a50fe70 authored by Frans Pop's avatar Frans Pop Committed by Len Brown
Browse files

ACPI: suspend: consolidate handling of Sx states addendum 



Make the S0 state be always reported as supported

Signed-off: Frans Pop <elendil@planet.nl>
Acked-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent f216cc37

drivers/acpi/sleep/main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -401,9 +401,11 @@ int __init acpi_sleep_init(void) 
	if (acpi_disabled)

	if (acpi_disabled)

		return 0;

		return 0;





printk(KERN_INFO PREFIX "(supports");

	sleep_states[ACPI_STATE_S0] = 1;

	printk(KERN_INFO PREFIX "(supports S0");



#ifdef CONFIG_SUSPEND

#ifdef CONFIG_SUSPEND

	for (i = ACPI_STATE_S0; i < ACPI_STATE_S4; i++) {

	for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {

		status = acpi_get_sleep_type_data(i, &type_a, &type_b);

		status = acpi_get_sleep_type_data(i, &type_a, &type_b);

		if (ACPI_SUCCESS(status)) {

		if (ACPI_SUCCESS(status)) {

			sleep_states[i] = 1;

			sleep_states[i] = 1;