diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/sleep/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 495c63a3e0af..b45806d77288 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -368,8 +368,8 @@ int acpi_suspend(u32 acpi_state) | |||
368 | /** | 368 | /** |
369 | * acpi_pm_device_sleep_state - return preferred power state of ACPI device | 369 | * acpi_pm_device_sleep_state - return preferred power state of ACPI device |
370 | * in the system sleep state given by %acpi_target_sleep_state | 370 | * in the system sleep state given by %acpi_target_sleep_state |
371 | * @dev: device to examine | 371 | * @dev: device to examine; its driver model wakeup flags control |
372 | * @wake: if set, the device should be able to wake up the system | 372 | * whether it should be able to wake up the system |
373 | * @d_min_p: used to store the upper limit of allowed states range | 373 | * @d_min_p: used to store the upper limit of allowed states range |
374 | * Return value: preferred power state of the device on success, -ENODEV on | 374 | * Return value: preferred power state of the device on success, -ENODEV on |
375 | * failure (ie. if there's no 'struct acpi_device' for @dev) | 375 | * failure (ie. if there's no 'struct acpi_device' for @dev) |
@@ -387,7 +387,7 @@ int acpi_suspend(u32 acpi_state) | |||
387 | * via @wake. | 387 | * via @wake. |
388 | */ | 388 | */ |
389 | 389 | ||
390 | int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p) | 390 | int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p) |
391 | { | 391 | { |
392 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); | 392 | acpi_handle handle = DEVICE_ACPI_HANDLE(dev); |
393 | struct acpi_device *adev; | 393 | struct acpi_device *adev; |
@@ -426,7 +426,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p) | |||
426 | * can wake the system. _S0W may be valid, too. | 426 | * can wake the system. _S0W may be valid, too. |
427 | */ | 427 | */ |
428 | if (acpi_target_sleep_state == ACPI_STATE_S0 || | 428 | if (acpi_target_sleep_state == ACPI_STATE_S0 || |
429 | (wake && adev->wakeup.state.enabled && | 429 | (device_may_wakeup(dev) && adev->wakeup.state.enabled && |
430 | adev->wakeup.sleep_state <= acpi_target_sleep_state)) { | 430 | adev->wakeup.sleep_state <= acpi_target_sleep_state)) { |
431 | acpi_status status; | 431 | acpi_status status; |
432 | 432 | ||