diff options
author | Michael Schimek <mschimek@gmx.at> | 2007-01-26 06:30:05 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:35:08 -0500 |
commit | feaba7a96dd02f2fc0d1fe5c2148d79444db0717 (patch) | |
tree | 73486db266e32e01ef4b9127a9549fd1237bc9b7 /drivers/media/video | |
parent | 712642b8e371687e24ec8e1d34114beab18e92ca (diff) |
V4L/DVB (5156): Fix: dma free is being called with wrong arguments
Functions buffer_release() in bttv-driver.c and
vbi_buffer_release() in bttv-vbi.c are ending with:
bttv_dma_free(&fh->cap,fh->btv,buf);
For vbi it seems to be wrong. Both functions should end with:
bttv_dma_free(q,fh->btv,buf);
Thanks to Peter Schlaf <peter.schlaf@web.de> for pointing this.
Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-vbi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 50dfad47ccff..5720b77ac9a7 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -1880,7 +1880,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) | |||
1880 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); | 1880 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); |
1881 | struct bttv_fh *fh = q->priv_data; | 1881 | struct bttv_fh *fh = q->priv_data; |
1882 | 1882 | ||
1883 | bttv_dma_free(&fh->cap,fh->btv,buf); | 1883 | bttv_dma_free(q,fh->btv,buf); |
1884 | } | 1884 | } |
1885 | 1885 | ||
1886 | static struct videobuf_queue_ops bttv_video_qops = { | 1886 | static struct videobuf_queue_ops bttv_video_qops = { |
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c index 754f66bfdf46..93e35de5a181 100644 --- a/drivers/media/video/bt8xx/bttv-vbi.c +++ b/drivers/media/video/bt8xx/bttv-vbi.c | |||
@@ -224,7 +224,7 @@ static void vbi_buffer_release(struct videobuf_queue *q, struct videobuf_buffer | |||
224 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); | 224 | struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb); |
225 | 225 | ||
226 | dprintk("free %p\n",vb); | 226 | dprintk("free %p\n",vb); |
227 | bttv_dma_free(&fh->cap,fh->btv,buf); | 227 | bttv_dma_free(q,fh->btv,buf); |
228 | } | 228 | } |
229 | 229 | ||
230 | struct videobuf_queue_ops bttv_vbi_qops = { | 230 | struct videobuf_queue_ops bttv_vbi_qops = { |