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