diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-11 01:08:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-11 01:08:35 +0100 |
| commit | 6a1c64cb401d14babf7df6307fe8ed5b9728df30 (patch) | |
| tree | 77eddb6bc1d5cafdbe7f35caae11ce4fb337b2a8 /drivers/char | |
| parent | 13de22c59fd1f5a452fea806a5f822883deec88b (diff) | |
| parent | 158204397034f088bfd505eeee281f7072da1c24 (diff) | |
| download | lwn-6a1c64cb401d14babf7df6307fe8ed5b9728df30.tar.gz lwn-6a1c64cb401d14babf7df6307fe8ed5b9728df30.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm-next
Pull APM update for 3.14-rc1 from Jiri Kosina.
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
apm-emulation: add hibernation APM events to support suspend2disk
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/apm-emulation.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c index 46118f845948..dd9dfa15e9d1 100644 --- a/drivers/char/apm-emulation.c +++ b/drivers/char/apm-emulation.c @@ -531,6 +531,7 @@ static int apm_suspend_notifier(struct notifier_block *nb, { struct apm_user *as; int err; + unsigned long apm_event; /* short-cut emergency suspends */ if (atomic_read(&userspace_notification_inhibit)) @@ -538,6 +539,9 @@ static int apm_suspend_notifier(struct notifier_block *nb, switch (event) { case PM_SUSPEND_PREPARE: + case PM_HIBERNATION_PREPARE: + apm_event = (event == PM_SUSPEND_PREPARE) ? + APM_USER_SUSPEND : APM_USER_HIBERNATION; /* * Queue an event to all "writer" users that we want * to suspend and need their ack. @@ -550,7 +554,7 @@ static int apm_suspend_notifier(struct notifier_block *nb, as->writer && as->suser) { as->suspend_state = SUSPEND_PENDING; atomic_inc(&suspend_acks_pending); - queue_add_event(&as->queue, APM_USER_SUSPEND); + queue_add_event(&as->queue, apm_event); } } @@ -601,11 +605,14 @@ static int apm_suspend_notifier(struct notifier_block *nb, return notifier_from_errno(err); case PM_POST_SUSPEND: + case PM_POST_HIBERNATION: + apm_event = (event == PM_POST_SUSPEND) ? + APM_NORMAL_RESUME : APM_HIBERNATION_RESUME; /* * Anyone on the APM queues will think we're still suspended. * Send a message so everyone knows we're now awake again. */ - queue_event(APM_NORMAL_RESUME); + queue_event(apm_event); /* * Finally, wake up anyone who is sleeping on the suspend. |