aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-20 16:39:46 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:14 -0400
commit08bff03ed697a583612b62a6ac566bd5bce98012 (patch)
tree733cf5b266cd7c5b064209dccd7ad6f18d989101 /drivers/media/video/cx88/cx88-video.c
parent97397687886aa8ecd4ec603fab9e70e970c11597 (diff)
V4L/DVB: videobuf: add ext_lock argument to the queue init functions
Add an ext_lock argument to the videobuf init functions. This allows drivers to pass the vdev->lock pointer (or any other externally held lock) to videobuf. For now all drivers just pass NULL. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r--drivers/media/video/cx88/cx88-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 2da9117b138e..19c64a7d0985 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -793,13 +793,13 @@ static int video_open(struct file *file)
793 V4L2_BUF_TYPE_VIDEO_CAPTURE, 793 V4L2_BUF_TYPE_VIDEO_CAPTURE,
794 V4L2_FIELD_INTERLACED, 794 V4L2_FIELD_INTERLACED,
795 sizeof(struct cx88_buffer), 795 sizeof(struct cx88_buffer),
796 fh); 796 fh, NULL);
797 videobuf_queue_sg_init(&fh->vbiq, &cx8800_vbi_qops, 797 videobuf_queue_sg_init(&fh->vbiq, &cx8800_vbi_qops,
798 &dev->pci->dev, &dev->slock, 798 &dev->pci->dev, &dev->slock,
799 V4L2_BUF_TYPE_VBI_CAPTURE, 799 V4L2_BUF_TYPE_VBI_CAPTURE,
800 V4L2_FIELD_SEQ_TB, 800 V4L2_FIELD_SEQ_TB,
801 sizeof(struct cx88_buffer), 801 sizeof(struct cx88_buffer),
802 fh); 802 fh, NULL);
803 803
804 if (fh->radio) { 804 if (fh->radio) {
805 dprintk(1,"video_open: setting radio device\n"); 805 dprintk(1,"video_open: setting radio device\n");