diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 20:46:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 20:46:13 +0200 |
| commit | e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50 (patch) | |
| tree | 35d66a4fc97aa642c14483966f050b5663ff02ca /drivers/base/power | |
| parent | Merge back earlier 'pm-sleep' material for v3.18. (diff) | |
| parent | PM / genirq: Document rules related to system suspend and interrupts (diff) | |
| download | linux-dev-e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50.tar.xz linux-dev-e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50.zip | |
Merge branch 'pm-genirq' into acpi-pm
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/wakeup.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index eb1bd2ecad8b..c2744b30d5d9 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -24,6 +24,9 @@ */ bool events_check_enabled __read_mostly; +/* If set and the system is suspending, terminate the suspend. */ +static bool pm_abort_suspend __read_mostly; + /* * Combined counters of registered wakeup events and wakeup events in progress. * They need to be modified together atomically, so it's better to use one @@ -719,7 +722,18 @@ bool pm_wakeup_pending(void) pm_print_active_wakeup_sources(); } - return ret; + return ret || pm_abort_suspend; +} + +void pm_system_wakeup(void) +{ + pm_abort_suspend = true; + freeze_wake(); +} + +void pm_wakeup_clear(void) +{ + pm_abort_suspend = false; } /** |