diff options
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 0b557c0d405e..4ca667251272 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -60,13 +60,17 @@ static struct notifier_block tts_notifier = {  	.priority	= 0,  }; +#ifndef acpi_skip_set_wakeup_address +#define acpi_skip_set_wakeup_address() false +#endif +  static int acpi_sleep_prepare(u32 acpi_state)  {  #ifdef CONFIG_ACPI_SLEEP  	unsigned long acpi_wakeup_address;  	/* do we have a wakeup address for S2 and S3? */ -	if (acpi_state == ACPI_STATE_S3) { +	if (acpi_state == ACPI_STATE_S3 && !acpi_skip_set_wakeup_address()) {  		acpi_wakeup_address = acpi_get_wakeup_address();  		if (!acpi_wakeup_address)  			return -EFAULT;  |