Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index e17b6fee046b..9797e5a69265 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -820,14 +820,11 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
         struct vivi_dev *dev = video_drvdata(file);
-        struct videobuf_queue *q = &dev->vb_vidq;
 
         int ret = vidioc_try_fmt_vid_cap(file, priv, f);
         if (ret < 0)
                 return ret;
 
-        mutex_lock(&q->vb_lock);
-
         if (vivi_is_generating(dev)) {
                 dprintk(dev, 1, "%s device busy\n", __func__);
                 ret = -EBUSY;
@@ -840,7 +837,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         dev->vb_vidq.field = f->fmt.pix.field;
         ret = 0;
 out:
-        mutex_unlock(&q->vb_lock);
         return ret;
 }
 
@@ -1086,7 +1082,7 @@ static const struct v4l2_file_operations vivi_fops = {
         .release        = vivi_close,
         .read           = vivi_read,
         .poll           = vivi_poll,
-        .ioctl          = video_ioctl2, /* V4L2 ioctl handler */
+        .unlocked_ioctl = video_ioctl2, /* V4L2 ioctl handler */
         .mmap           = vivi_mmap,
 };
 
@@ -1173,19 +1169,19 @@ static int __init vivi_create_instance(int inst)
         dev->saturation = 127;
         dev->hue = 0;
 
+        /* initialize locks */
+        spin_lock_init(&dev->slock);
+        mutex_init(&dev->mutex);
+
         videobuf_queue_vmalloc_init(&dev->vb_vidq, &vivi_video_qops,
                         NULL, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
                         V4L2_FIELD_INTERLACED,
-                        sizeof(struct vivi_buffer), dev);
+                        sizeof(struct vivi_buffer), dev, &dev->mutex);
 
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
         init_waitqueue_head(&dev->vidq.wq);
 
-        /* initialize locks */
-        spin_lock_init(&dev->slock);
-        mutex_init(&dev->mutex);
-
         ret = -ENOMEM;
         vfd = video_device_alloc();
         if (!vfd)
@@ -1194,6 +1190,7 @@ static int __init vivi_create_instance(int inst)
         *vfd = vivi_template;
         vfd->debug = debug;
         vfd->v4l2_dev = &dev->v4l2_dev;
+        vfd->lock = &dev->mutex;
 
         ret = video_register_device(vfd, VFL_TYPE_GRABBER, video_nr);
         if (ret < 0)