diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-05-06 17:50:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:59 -0400 |
commit | 1525a2ad76f991eba9755f75c9b6d4d97abad25e (patch) | |
tree | 7e5307d825e1f8a55581a0b465865b9f2cc90af6 /kernel/power | |
parent | 04293355ac9dbe81bd01b89ca2adb58be34c2c60 (diff) |
swsusp: fix error paths in snapshot_open
We forget to increase device_available if there's an error in snapshot_open(),
so the snapshot device cannot be open at all after snapshot_open() has
returned an error.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/user.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index 845acd84cb23..bd1771f7a64e 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
@@ -49,12 +49,14 @@ static int snapshot_open(struct inode *inode, struct file *filp) | |||
49 | if (!atomic_add_unless(&device_available, -1, 0)) | 49 | if (!atomic_add_unless(&device_available, -1, 0)) |
50 | return -EBUSY; | 50 | return -EBUSY; |
51 | 51 | ||
52 | if ((filp->f_flags & O_ACCMODE) == O_RDWR) | 52 | if ((filp->f_flags & O_ACCMODE) == O_RDWR) { |
53 | atomic_inc(&device_available); | ||
53 | return -ENOSYS; | 54 | return -ENOSYS; |
54 | 55 | } | |
55 | if(create_basic_memory_bitmaps()) | 56 | if(create_basic_memory_bitmaps()) { |
57 | atomic_inc(&device_available); | ||
56 | return -ENOMEM; | 58 | return -ENOMEM; |
57 | 59 | } | |
58 | nonseekable_open(inode, filp); | 60 | nonseekable_open(inode, filp); |
59 | data = &snapshot_state; | 61 | data = &snapshot_state; |
60 | filp->private_data = data; | 62 | filp->private_data = data; |