aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-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/cx231xx/cx231xx-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/cx231xx/cx231xx-video.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index e76014561aa7..b638c4ed3f2e 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -2008,7 +2008,8 @@ static int cx231xx_v4l2_open(struct file *filp)
2008 videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_video_qops, 2008 videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_video_qops,
2009 NULL, &dev->video_mode.slock, 2009 NULL, &dev->video_mode.slock,
2010 fh->type, V4L2_FIELD_INTERLACED, 2010 fh->type, V4L2_FIELD_INTERLACED,
2011 sizeof(struct cx231xx_buffer), fh); 2011 sizeof(struct cx231xx_buffer),
2012 fh, NULL);
2012 if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) { 2013 if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
2013 /* Set the required alternate setting VBI interface works in 2014 /* Set the required alternate setting VBI interface works in
2014 Bulk mode only */ 2015 Bulk mode only */
@@ -2017,7 +2018,8 @@ static int cx231xx_v4l2_open(struct file *filp)
2017 videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_vbi_qops, 2018 videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_vbi_qops,
2018 NULL, &dev->vbi_mode.slock, 2019 NULL, &dev->vbi_mode.slock,
2019 fh->type, V4L2_FIELD_SEQ_TB, 2020 fh->type, V4L2_FIELD_SEQ_TB,
2020 sizeof(struct cx231xx_buffer), fh); 2021 sizeof(struct cx231xx_buffer),
2022 fh, NULL);
2021 } 2023 }
2022 2024
2023 mutex_unlock(&dev->lock); 2025 mutex_unlock(&dev->lock);