git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
media
/
common
/
saa7146_fops.c
diff --git
a/drivers/media/common/saa7146_fops.c
b/drivers/media/common/saa7146_fops.c
index
4da2a54
..
e3fedc6
100644
(file)
--- 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,
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);
buf->vb.state = VIDEOBUF_NEEDS_INIT;