Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-beck.git] / kernel / power / user.c

diff --git a/kernel/power/user.c b/kernel/power/user.c
index 2e4499f3e4d9a0a7c09d3caeb700c66aed671a1f..72825c853cd7251bf73fa13cbea63e78c09d8845 100644 (file)
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -196,7 +196,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                snapshot_free_unused_memory(&data->handle);
                down(&pm_sem);
                pm_prepare_console();
-               error = device_suspend(PMSG_FREEZE);
+               error = device_suspend(PMSG_PRETHAW);
                if (!error) {
                        error = swsusp_resume();
                        device_resume();