aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 9e6e1c6eb60a..16bd68504ff7 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -414,13 +414,13 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state);
414int acpi_disable_wakeup_device_power(struct acpi_device *dev); 414int acpi_disable_wakeup_device_power(struct acpi_device *dev);
415 415
416#ifdef CONFIG_PM 416#ifdef CONFIG_PM
417int acpi_pm_device_sleep_state(struct device *, int *); 417int acpi_pm_device_sleep_state(struct device *, int *, int);
418#else 418#else
419static inline int acpi_pm_device_sleep_state(struct device *d, int *p) 419static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
420{ 420{
421 if (p) 421 if (p)
422 *p = ACPI_STATE_D0; 422 *p = ACPI_STATE_D0;
423 return ACPI_STATE_D3; 423 return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0;
424} 424}
425#endif 425#endif
426 426