diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-20 16:39:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:14 -0400 |
commit | 08bff03ed697a583612b62a6ac566bd5bce98012 (patch) | |
tree | 733cf5b266cd7c5b064209dccd7ad6f18d989101 /drivers/media/video/bt8xx | |
parent | 97397687886aa8ecd4ec603fab9e70e970c11597 (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/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 69a8ad24c0b3..3da6e80e1041 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3318,13 +3318,13 @@ static int bttv_open(struct file *file) | |||
3318 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 3318 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
3319 | V4L2_FIELD_INTERLACED, | 3319 | V4L2_FIELD_INTERLACED, |
3320 | sizeof(struct bttv_buffer), | 3320 | sizeof(struct bttv_buffer), |
3321 | fh); | 3321 | fh, NULL); |
3322 | videobuf_queue_sg_init(&fh->vbi, &bttv_vbi_qops, | 3322 | videobuf_queue_sg_init(&fh->vbi, &bttv_vbi_qops, |
3323 | &btv->c.pci->dev, &btv->s_lock, | 3323 | &btv->c.pci->dev, &btv->s_lock, |
3324 | V4L2_BUF_TYPE_VBI_CAPTURE, | 3324 | V4L2_BUF_TYPE_VBI_CAPTURE, |
3325 | V4L2_FIELD_SEQ_TB, | 3325 | V4L2_FIELD_SEQ_TB, |
3326 | sizeof(struct bttv_buffer), | 3326 | sizeof(struct bttv_buffer), |
3327 | fh); | 3327 | fh, NULL); |
3328 | set_tvnorm(btv,btv->tvnorm); | 3328 | set_tvnorm(btv,btv->tvnorm); |
3329 | set_input(btv, btv->input, btv->tvnorm); | 3329 | set_input(btv, btv->input, btv->tvnorm); |
3330 | 3330 | ||