diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 11:10:01 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 19:53:06 +0100 |
| commit | 805bdaec1a44155db35f6ee5410d6bbc365324a8 (patch) | |
| tree | 01f5ba1cca8216de1a6057be8c1877c778603a2d /include/linux/pm.h | |
| parent | 2aa15890f3c191326678f1bd68af61ec6b8753ec (diff) | |
| download | kernel_samsung_smdk4412-805bdaec1a44155db35f6ee5410d6bbc365324a8.zip kernel_samsung_smdk4412-805bdaec1a44155db35f6ee5410d6bbc365324a8.tar.gz kernel_samsung_smdk4412-805bdaec1a44155db35f6ee5410d6bbc365324a8.tar.bz2 | |
PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset
Commit 074037e (PM / Wakeup: Introduce wakeup source objects and
event statistics (v3)) caused ACPI wakeup to only work if
CONFIG_PM_SLEEP is set, but it also worked for CONFIG_PM_SLEEP unset
before. This can be fixed by making device_set_wakeup_enable(),
device_init_wakeup() and device_may_wakeup() work in the same way
as before commit 074037e when CONFIG_PM_SLEEP is unset.
Reported-and-tested-by: Justin Maggard <jmaggard10@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index dd9c7ab..21415cc 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -431,6 +431,8 @@ struct dev_pm_info { struct list_head entry; struct completion completion; struct wakeup_source *wakeup; +#else + unsigned int should_wakeup:1; #endif #ifdef CONFIG_PM_RUNTIME struct timer_list suspend_timer; |