diff options
Diffstat (limited to 'drivers/acpi/wakeup.c')
| -rw-r--r-- | drivers/acpi/wakeup.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index f62a50c3ed34..ed6501452507 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c | |||
| @@ -37,15 +37,16 @@ void acpi_enable_wakeup_devices(u8 sleep_state) | |||
| 37 | container_of(node, struct acpi_device, wakeup_list); | 37 | container_of(node, struct acpi_device, wakeup_list); |
| 38 | 38 | ||
| 39 | if (!dev->wakeup.flags.valid | 39 | if (!dev->wakeup.flags.valid |
| 40 | || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count) | 40 | || sleep_state > (u32) dev->wakeup.sleep_state |
| 41 | || sleep_state > (u32) dev->wakeup.sleep_state) | 41 | || !(device_may_wakeup(&dev->dev) |
| 42 | || dev->wakeup.prepare_count)) | ||
| 42 | continue; | 43 | continue; |
| 43 | 44 | ||
| 44 | if (dev->wakeup.state.enabled) | 45 | if (device_may_wakeup(&dev->dev)) |
| 45 | acpi_enable_wakeup_device_power(dev, sleep_state); | 46 | acpi_enable_wakeup_device_power(dev, sleep_state); |
| 46 | 47 | ||
| 47 | /* The wake-up power should have been enabled already. */ | 48 | /* The wake-up power should have been enabled already. */ |
| 48 | acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number, | 49 | acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number, |
| 49 | ACPI_GPE_ENABLE); | 50 | ACPI_GPE_ENABLE); |
| 50 | } | 51 | } |
| 51 | } | 52 | } |
| @@ -63,14 +64,15 @@ void acpi_disable_wakeup_devices(u8 sleep_state) | |||
| 63 | container_of(node, struct acpi_device, wakeup_list); | 64 | container_of(node, struct acpi_device, wakeup_list); |
| 64 | 65 | ||
| 65 | if (!dev->wakeup.flags.valid | 66 | if (!dev->wakeup.flags.valid |
| 66 | || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count) | 67 | || sleep_state > (u32) dev->wakeup.sleep_state |
| 67 | || (sleep_state > (u32) dev->wakeup.sleep_state)) | 68 | || !(device_may_wakeup(&dev->dev) |
| 69 | || dev->wakeup.prepare_count)) | ||
| 68 | continue; | 70 | continue; |
| 69 | 71 | ||
| 70 | acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number, | 72 | acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number, |
| 71 | ACPI_GPE_DISABLE); | 73 | ACPI_GPE_DISABLE); |
| 72 | 74 | ||
| 73 | if (dev->wakeup.state.enabled) | 75 | if (device_may_wakeup(&dev->dev)) |
| 74 | acpi_disable_wakeup_device_power(dev); | 76 | acpi_disable_wakeup_device_power(dev); |
| 75 | } | 77 | } |
| 76 | } | 78 | } |
| @@ -84,8 +86,8 @@ int __init acpi_wakeup_device_init(void) | |||
| 84 | struct acpi_device *dev = container_of(node, | 86 | struct acpi_device *dev = container_of(node, |
| 85 | struct acpi_device, | 87 | struct acpi_device, |
| 86 | wakeup_list); | 88 | wakeup_list); |
| 87 | if (dev->wakeup.flags.always_enabled) | 89 | if (device_can_wakeup(&dev->dev)) |
| 88 | dev->wakeup.state.enabled = 1; | 90 | device_set_wakeup_enable(&dev->dev, true); |
| 89 | } | 91 | } |
| 90 | mutex_unlock(&acpi_device_lock); | 92 | mutex_unlock(&acpi_device_lock); |
| 91 | return 0; | 93 | return 0; |