diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-20 17:39:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:14 -0200 |
| commit | 08bff03ed697a583612b62a6ac566bd5bce98012 (patch) | |
| tree | 733cf5b266cd7c5b064209dccd7ad6f18d989101 /drivers/media/common | |
| parent | 97397687886aa8ecd4ec603fab9e70e970c11597 (diff) | |
| download | op-kernel-dev-08bff03ed697a583612b62a6ac566bd5bce98012.zip op-kernel-dev-08bff03ed697a583612b62a6ac566bd5bce98012.tar.gz | |
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 8224c30..2d4533a 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) V4L2_BUF_TYPE_VBI_CAPTURE, V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf), - file); + file, NULL); init_timer(&fh->vbi_read_timeout); 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 a212a91..741c573 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) V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED, sizeof(struct saa7146_buf), - file); + file, NULL); return 0; } |
