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/videobuf-core.c | |
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/videobuf-core.c')
-rw-r--r-- | drivers/media/video/videobuf-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index 2930665910b7..a32ef8eafc01 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -125,11 +125,13 @@ void videobuf_queue_core_init(struct videobuf_queue *q, | |||
125 | enum v4l2_field field, | 125 | enum v4l2_field field, |
126 | unsigned int msize, | 126 | unsigned int msize, |
127 | void *priv, | 127 | void *priv, |
128 | struct videobuf_qtype_ops *int_ops) | 128 | struct videobuf_qtype_ops *int_ops, |
129 | struct mutex *ext_lock) | ||
129 | { | 130 | { |
130 | BUG_ON(!q); | 131 | BUG_ON(!q); |
131 | memset(q, 0, sizeof(*q)); | 132 | memset(q, 0, sizeof(*q)); |
132 | q->irqlock = irqlock; | 133 | q->irqlock = irqlock; |
134 | q->ext_lock = ext_lock; | ||
133 | q->dev = dev; | 135 | q->dev = dev; |
134 | q->type = type; | 136 | q->type = type; |
135 | q->field = field; | 137 | q->field = field; |