]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
swsusp: fix error paths in snapshot_open
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 May 2007 21:50:44 +0000 (14:50 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 May 2007 19:12:59 +0000 (12:12 -0700)
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>
kernel/power/user.c

index 845acd84cb236292fa82b771da1efe7ccad14d2c..bd1771f7a64ee141a2770fe202e7c724923010fd 100644 (file)
@@ -49,12 +49,14 @@ static int snapshot_open(struct inode *inode, struct file *filp)
        if (!atomic_add_unless(&device_available, -1, 0))
                return -EBUSY;
 
-       if ((filp->f_flags & O_ACCMODE) == O_RDWR)
+       if ((filp->f_flags & O_ACCMODE) == O_RDWR) {
+               atomic_inc(&device_available);
                return -ENOSYS;
-
-       if(create_basic_memory_bitmaps())
+       }
+       if(create_basic_memory_bitmaps()) {
+               atomic_inc(&device_available);
                return -ENOMEM;
-
+       }
        nonseekable_open(inode, filp);
        data = &snapshot_state;
        filp->private_data = data;