diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-26 08:01:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:14 -0400 |
commit | 0e0809a58869e3e422985f868ad5e0da1fc0ba85 (patch) | |
tree | e4895d60a050e15d6c4b21aa7dbc4090199efdf3 /drivers/media/common | |
parent | 08bff03ed697a583612b62a6ac566bd5bce98012 (diff) |
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/common')
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 4da2a54cb8bd..e3fedc60fe77 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -56,7 +56,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q, | |||
56 | 56 | ||
57 | BUG_ON(in_interrupt()); | 57 | BUG_ON(in_interrupt()); |
58 | 58 | ||
59 | videobuf_waiton(&buf->vb,0,0); | 59 | videobuf_waiton(q, &buf->vb, 0, 0); |
60 | videobuf_dma_unmap(q->dev, dma); | 60 | videobuf_dma_unmap(q->dev, dma); |
61 | videobuf_dma_free(dma); | 61 | videobuf_dma_free(dma); |
62 | buf->vb.state = VIDEOBUF_NEEDS_INIT; | 62 | buf->vb.state = VIDEOBUF_NEEDS_INIT; |