diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-26 16:01:26 +0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:06:14 +0400 |
commit | 0e0809a58869e3e422985f868ad5e0da1fc0ba85 (patch) | |
tree | e4895d60a050e15d6c4b21aa7dbc4090199efdf3 /drivers/media/video/sh_vou.c | |
parent | 08bff03ed697a583612b62a6ac566bd5bce98012 (diff) | |
download | linux-0e0809a58869e3e422985f868ad5e0da1fc0ba85.tar.xz |
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 'drivers/media/video/sh_vou.c')
-rw-r--r-- | drivers/media/video/sh_vou.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/sh_vou.c b/drivers/media/video/sh_vou.c index d394187eb701..d3acd02a1632 100644 --- a/drivers/media/video/sh_vou.c +++ b/drivers/media/video/sh_vou.c @@ -230,7 +230,7 @@ static void free_buffer(struct videobuf_queue *vq, struct videobuf_buffer *vb) BUG_ON(in_interrupt()); /* Wait until this buffer is no longer in STATE_QUEUED or STATE_ACTIVE */ - videobuf_waiton(vb, 0, 0); + videobuf_waiton(vq, vb, 0, 0); videobuf_dma_contig_free(vq, vb); vb->state = VIDEOBUF_NEEDS_INIT; } |