V4L/DVB (9074): gspca: sonixj webcam 0c45:60fe added.

[linux-2.6-omap-h63xx.git] / drivers / media / video / zr364xx.c

diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 9d5d5985a7ea6ba2fb638145240ae8c9a7a50ca9..93991cb9ca713b9ae1b5e96a544f1c4ce22a61e5 100644 (file)
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -116,6 +116,7 @@ struct zr364xx_camera {
        int height;
        int method;
        struct mutex lock;
+       int users;
 };
 
 
@@ -643,11 +644,10 @@ static int zr364xx_open(struct inode *inode, struct file *file)
 
        mutex_lock(&cam->lock);
 
-       cam->skip = 2;
-
-       err = video_exclusive_open(inode, file);
-       if (err < 0)
+       if (cam->users) {
+               err = -EBUSY;
                goto out;
+       }
 
        if (!cam->framebuf) {
                cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);
@@ -669,6 +669,8 @@ static int zr364xx_open(struct inode *inode, struct file *file)
                }
        }
 
+       cam->skip = 2;
+       cam->users++;
        file->private_data = vdev;
 
        /* Added some delay here, since opening/closing the camera quickly,
@@ -700,6 +702,10 @@ static int zr364xx_release(struct inode *inode, struct file *file)
        udev = cam->udev;
 
        mutex_lock(&cam->lock);
+
+       cam->users--;
+       file->private_data = NULL;
+
        for (i = 0; i < 2; i++) {
                err =
                    send_control_msg(udev, 1, init[cam->method][i].value,
@@ -707,21 +713,19 @@ static int zr364xx_release(struct inode *inode, struct file *file)
                                     init[cam->method][i].size);
                if (err < 0) {
                        info("error during release sequence");
-                       mutex_unlock(&cam->lock);
-                       return err;
+                       goto out;
                }
        }
 
-       file->private_data = NULL;
-       video_exclusive_release(inode, file);
-
        /* Added some delay here, since opening/closing the camera quickly,
         * like Ekiga does during its startup, can crash the webcam
         */
        mdelay(100);
+       err = 0;
 
+out:
        mutex_unlock(&cam->lock);
-       return 0;
+       return err;
 }