diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
| commit | d4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch) | |
| tree | 3d65887b06c575a94feed1fd91216e32a62b31d8 /kernel/power/user.c | |
| parent | 3a011a171906a3a51a43bb860fb7c66a64cab140 (diff) | |
| parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 005b93d839ba..6c85359364f2 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -95,15 +95,15 @@ static int snapshot_open(struct inode *inode, struct file *filp) data->swap = swsusp_resume_device ? swap_type_of(swsusp_resume_device, 0, NULL) : -1; data->mode = O_RDONLY; - error = pm_notifier_call_chain(PM_RESTORE_PREPARE); + error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE); if (error) - pm_notifier_call_chain(PM_POST_RESTORE); + pm_notifier_call_chain(PM_POST_HIBERNATION); } else { data->swap = -1; data->mode = O_WRONLY; - error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE); + error = pm_notifier_call_chain(PM_RESTORE_PREPARE); if (error) - pm_notifier_call_chain(PM_POST_HIBERNATION); + pm_notifier_call_chain(PM_POST_RESTORE); } if (error) atomic_inc(&snapshot_device_available); |