]> git.baikalelectronics.ru Git - kernel.git/commit
PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 24 Feb 2011 10:10:01 +0000 (11:10 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 24 Feb 2011 18:53:06 +0000 (19:53 +0100)
commit22881154db2e967b72bcdc3c92151dd010b26852
tree01f5ba1cca8216de1a6057be8c1877c778603a2d
parentb2734cee29bcecbe0a24529608ce758baa492abc
PM: Make ACPI wakeup from S5 work again when CONFIG_PM_SLEEP is unset

Commit 505ebe9 (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 505ebe9 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>
include/linux/pm.h
include/linux/pm_wakeup.h