git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[pandora-kernel.git]
/
kernel
/
power
/
user.c
diff --git
a/kernel/power/user.c
b/kernel/power/user.c
index
2e4499f
..
72825c8
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();