git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
bt8xx
/
bttv-risc.c
diff --git
a/drivers/media/video/bt8xx/bttv-risc.c
b/drivers/media/video/bt8xx/bttv-risc.c
index c24b1c100e13fe0fb1c225950c6427da7b50db7f..0fa9f39f37a32be9303993b3e4f31835c6042ebf 100644
(file)
--- a/
drivers/media/video/bt8xx/bttv-risc.c
+++ b/
drivers/media/video/bt8xx/bttv-risc.c
@@
-583,7
+583,7
@@
bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf
BUG_ON(in_interrupt());
videobuf_waiton(&buf->vb,0,0);
- videobuf_dma_unmap(q, dma);
+ videobuf_dma_unmap(q
->dev
, dma);
videobuf_dma_free(dma);
btcx_riscmem_free(btv->c.pci,&buf->bottom);
btcx_riscmem_free(btv->c.pci,&buf->top);