Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba3abd8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0fdfe5ad d88d4050

kernel/power/user.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -420,7 +420,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, 
			 * User space encodes device types as two-byte values,

			 * User space encodes device types as two-byte values,

			 * so we need to recode them

			 * so we need to recode them

			 */

			 */

			swdev = old_decode_dev(swap_area.dev);

			swdev = new_decode_dev(swap_area.dev);

			if (swdev) {

			if (swdev) {

				offset = swap_area.offset;

				offset = swap_area.offset;

				data->swap = swap_type_of(swdev, offset, NULL);

				data->swap = swap_type_of(swdev, offset, NULL);