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 /drivers/media/video/bt8xx/bttv-risc.c | |
| parent | 08bff03ed697a583612b62a6ac566bd5bce98012 (diff) | |
| download | kernel_samsung_smdk4412-0e0809a58869e3e422985f868ad5e0da1fc0ba85.zip kernel_samsung_smdk4412-0e0809a58869e3e422985f868ad5e0da1fc0ba85.tar.gz kernel_samsung_smdk4412-0e0809a58869e3e422985f868ad5e0da1fc0ba85.tar.bz2 | |
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/bt8xx/bttv-risc.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-risc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c index 0fa9f39..9b57d09 100644 --- a/drivers/media/video/bt8xx/bttv-risc.c +++ b/drivers/media/video/bt8xx/bttv-risc.c @@ -582,7 +582,7 @@ bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); BUG_ON(in_interrupt()); - videobuf_waiton(&buf->vb,0,0); + videobuf_waiton(q, &buf->vb, 0, 0); videobuf_dma_unmap(q->dev, dma); videobuf_dma_free(dma); btcx_riscmem_free(btv->c.pci,&buf->bottom); |