diff options
Diffstat (limited to 'drivers/acpi/wakeup.c')
| -rw-r--r-- | drivers/acpi/wakeup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index 88725dcdf8bc..e0ee0c036f5a 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c | |||
| @@ -68,7 +68,7 @@ void acpi_enable_wakeup_device(u8 sleep_state) | |||
| 68 | /* If users want to disable run-wake GPE, | 68 | /* If users want to disable run-wake GPE, |
| 69 | * we only disable it for wake and leave it for runtime | 69 | * we only disable it for wake and leave it for runtime |
| 70 | */ | 70 | */ |
| 71 | if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared) | 71 | if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count) |
| 72 | || sleep_state > (u32) dev->wakeup.sleep_state) { | 72 | || sleep_state > (u32) dev->wakeup.sleep_state) { |
| 73 | if (dev->wakeup.flags.run_wake) { | 73 | if (dev->wakeup.flags.run_wake) { |
| 74 | /* set_gpe_type will disable GPE, leave it like that */ | 74 | /* set_gpe_type will disable GPE, leave it like that */ |
| @@ -100,7 +100,7 @@ void acpi_disable_wakeup_device(u8 sleep_state) | |||
| 100 | if (!dev->wakeup.flags.valid) | 100 | if (!dev->wakeup.flags.valid) |
| 101 | continue; | 101 | continue; |
| 102 | 102 | ||
| 103 | if ((!dev->wakeup.state.enabled && !dev->wakeup.flags.prepared) | 103 | if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count) |
| 104 | || sleep_state > (u32) dev->wakeup.sleep_state) { | 104 | || sleep_state > (u32) dev->wakeup.sleep_state) { |
| 105 | if (dev->wakeup.flags.run_wake) { | 105 | if (dev->wakeup.flags.run_wake) { |
| 106 | acpi_set_gpe_type(dev->wakeup.gpe_device, | 106 | acpi_set_gpe_type(dev->wakeup.gpe_device, |