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/common | |
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/common')
-rw-r--r-- | drivers/media/common/saa7146_vbi.c | 2 | ||||
-rw-r--r-- | drivers/media/common/saa7146_video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 8224c301d050..2d4533ab22b7 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
@@ -412,7 +412,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) | |||
412 | V4L2_BUF_TYPE_VBI_CAPTURE, | 412 | V4L2_BUF_TYPE_VBI_CAPTURE, |
413 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? | 413 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? |
414 | sizeof(struct saa7146_buf), | 414 | sizeof(struct saa7146_buf), |
415 | file); | 415 | file, NULL); |
416 | 416 | ||
417 | init_timer(&fh->vbi_read_timeout); | 417 | init_timer(&fh->vbi_read_timeout); |
418 | fh->vbi_read_timeout.function = vbi_read_timeout; | 418 | fh->vbi_read_timeout.function = vbi_read_timeout; |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index a212a91a30f0..741c5732b430 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -1386,7 +1386,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file) | |||
1386 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 1386 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
1387 | V4L2_FIELD_INTERLACED, | 1387 | V4L2_FIELD_INTERLACED, |
1388 | sizeof(struct saa7146_buf), | 1388 | sizeof(struct saa7146_buf), |
1389 | file); | 1389 | file, NULL); |
1390 | 1390 | ||
1391 | return 0; | 1391 | return 0; |
1392 | } | 1392 | } |