diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 13:58:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 13:58:54 +0100 |
| commit | 7113fe74c10bc01abfdad2fe1f9ca023b0f83685 (patch) | |
| tree | 6b301a39850b9d41acb4bf3084dde2f012a5affc /drivers/base | |
| parent | a68d35323b091f51e0957313f0f871f187879143 (diff) | |
| parent | 957d1282bb8c07e682e142b9237cd9fcb8348a0b (diff) | |
Merge branch 'pm-assorted'
* pm-assorted:
suspend: enable freeze timeout configuration through sys
ACPI: enable ACPI SCI during suspend
PM: Introduce suspend state PM_SUSPEND_FREEZE
PM / Runtime: Add new helper function: pm_runtime_active()
PM / tracing: remove deprecated power trace API
PM: don't use [delayed_]work_pending()
PM / Domains: don't use [delayed_]work_pending()
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/domain.c | 3 | ||||
| -rw-r--r-- | drivers/base/power/wakeup.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index acc3a8ded29d..9a6b05a35603 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -433,8 +433,7 @@ static bool genpd_abort_poweroff(struct generic_pm_domain *genpd) */ void genpd_queue_power_off_work(struct generic_pm_domain *genpd) { - if (!work_pending(&genpd->power_off_work)) - queue_work(pm_wq, &genpd->power_off_work); + queue_work(pm_wq, &genpd->power_off_work); } /** diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index e6ee5e80e546..79715e7fa43e 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -382,6 +382,12 @@ static void wakeup_source_activate(struct wakeup_source *ws) { unsigned int cec; + /* + * active wakeup source should bring the system + * out of PM_SUSPEND_FREEZE state + */ + freeze_wake(); + ws->active = true; ws->active_count++; ws->last_time = ktime_get(); |