diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-26 09:01:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:14 -0200 |
| commit | 0e0809a58869e3e422985f868ad5e0da1fc0ba85 (patch) | |
| tree | e4895d60a050e15d6c4b21aa7dbc4090199efdf3 /include/media | |
| parent | 08bff03ed697a583612b62a6ac566bd5bce98012 (diff) | |
| download | linux-3.10-0e0809a58869e3e422985f868ad5e0da1fc0ba85.tar.gz linux-3.10-0e0809a58869e3e422985f868ad5e0da1fc0ba85.tar.bz2 linux-3.10-0e0809a58869e3e422985f868ad5e0da1fc0ba85.zip | |
V4L/DVB: videobuf: add queue argument to videobuf_waiton()
videobuf_waiton() must unlock and relock ext_lock if it has to wait.
For that to happen it needs the videobuf_queue pointer.
Don't attempt to unlock/relock q->ext_lock unless it was locked in the
first place.
vb->state has to be protected by a spinlock to be safe.
This patch is based on code from Mauro Carvalho Chehab <mchehab@redhat.com>.
[mchehab@redhat.com: add extra argument to a few missing places]
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf-core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 9a4194557e4..1d3835fc26b 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -180,7 +180,8 @@ static inline void videobuf_queue_unlock(struct videobuf_queue *q) mutex_unlock(&q->vb_lock); } -int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr); +int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb, + int non_blocking, int intr); int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, struct v4l2_framebuffer *fbuf); |