summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2010-04-10 22:28:56 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2010-04-10 22:28:56 +0200
commitd88d4050dcaf09e417aaa9a5024dd9449ef71b2e (patch)
tree5156b4821fdb1a3c13cb9577c93b2eb6acb48814 /kernel
parent0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff)
downloadlinux-d88d4050dcaf09e417aaa9a5024dd9449ef71b2e.tar.gz
linux-d88d4050dcaf09e417aaa9a5024dd9449ef71b2e.tar.bz2
linux-d88d4050dcaf09e417aaa9a5024dd9449ef71b2e.zip
PM / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling
When CONFIG_DEBUG_BLOCK_EXT_DEVT is set we decode the device improperly by old_decode_dev and it results in an error while hibernating with s2disk. All users already pass the new device number, so switch to new_decode_dev(). Signed-off-by: Jiri Slaby <jslaby@suse.cz> Reported-and-tested-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Diffstat (limited to 'kernel')
-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);