Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Apr 2010 00:49:48 +0000 (17:49 -0700)
committerLinus 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

index 4d2289626a84e6d03dbc618db13fbb8af4bd6092..a8c96212bc1b4fdfb9f0c212066ff9bd9812690a 100644 (file)
@@ -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);