diff options
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 8 | 
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 54abb26b7366..9b6cebe227a0 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -674,6 +674,14 @@ static void acpi_sleep_suspend_setup(void)  		if (acpi_sleep_state_supported(i))  			sleep_states[i] = 1; +	/* +	 * Use suspend-to-idle by default if ACPI_FADT_LOW_POWER_S0 is set and +	 * the default suspend mode was not selected from the command line. +	 */ +	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0 && +	    mem_sleep_default > PM_SUSPEND_MEM) +		mem_sleep_default = PM_SUSPEND_FREEZE; +  	suspend_set_ops(old_suspend_ordering ?  		&acpi_suspend_ops_old : &acpi_suspend_ops);  	freeze_set_ops(&acpi_freeze_ops);  |