git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0fdfe5a
)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 14 Apr 2010 00:49:48 +0000
(17:49 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 14 Apr 2010 00:49:48 +0000
(17:49 -0700)
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling
kernel/power/user.c
patch
|
blob
|
history
diff --git
a/kernel/power/user.c
b/kernel/power/user.c
index
4d22896
..
a8c9621
100644
(file)
--- a/
kernel/power/user.c
+++ b/
kernel/power/user.c
@@
-420,7
+420,7
@@
static long snapshot_ioctl(struct file *filp, unsigned int cmd,
* User space encodes device types as two-byte values,
* so we need to recode them
*/
- swdev =
old
_decode_dev(swap_area.dev);
+ swdev =
new
_decode_dev(swap_area.dev);
if (swdev) {
offset = swap_area.offset;
data->swap = swap_type_of(swdev, offset, NULL);