From: Rafael J. Wysocki <[EMAIL PROTECTED]>

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 <[EMAIL PROTECTED]>
---
 kernel/power/user.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.21-rc4/kernel/power/user.c
===================================================================
--- linux-2.6.21-rc4.orig/kernel/power/user.c
+++ linux-2.6.21-rc4/kernel/power/user.c
@@ -49,12 +49,14 @@ static int snapshot_open(struct inode *i
        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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to