summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 17:49:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 17:49:48 -0700
commit2ba3abd8186f24c7fb418927025b4e2120e3a362 (patch)
tree1b88919b5e687c77627d91855b214ed5067997da
parent0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 (diff)
parentd88d4050dcaf09e417aaa9a5024dd9449ef71b2e (diff)
downloadlinux-2ba3abd8186f24c7fb418927025b4e2120e3a362.tar.gz
linux-2ba3abd8186f24c7fb418927025b4e2120e3a362.tar.bz2
linux-2ba3abd8186f24c7fb418927025b4e2120e3a362.zip
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* '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
-rw-r--r--kernel/power/user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 4d2289626a84..a8c96212bc1b 100644
--- 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);