git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-vbi.c
diff --git
a/drivers/media/video/saa7134/saa7134-vbi.c
b/drivers/media/video/saa7134/saa7134-vbi.c
index
f4aee0a
..
f38366a
100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-vbi.c
+++ b/
drivers/media/video/saa7134/saa7134-vbi.c
@@
-135,7
+135,7
@@
static int buffer_prepare(struct videobuf_queue *q,
return -EINVAL;
if (buf->vb.size != size)
return -EINVAL;
if (buf->vb.size != size)
- saa7134_dma_free(
dev
,buf);
+ saa7134_dma_free(
q
,buf);
if (STATE_NEEDS_INIT == buf->vb.state) {
buf->vb.width = llength;
if (STATE_NEEDS_INIT == buf->vb.state) {
buf->vb.width = llength;
@@
-143,7
+143,7
@@
static int buffer_prepare(struct videobuf_queue *q,
buf->vb.size = size;
buf->pt = &fh->pt_vbi;
buf->vb.size = size;
buf->pt = &fh->pt_vbi;
- err = videobuf_iolock(
dev->pci
,&buf->vb,NULL);
+ err = videobuf_iolock(
q
,&buf->vb,NULL);
if (err)
goto oops;
err = saa7134_pgtable_build(dev->pci,buf->pt,
if (err)
goto oops;
err = saa7134_pgtable_build(dev->pci,buf->pt,
@@
-159,7
+159,7
@@
static int buffer_prepare(struct videobuf_queue *q,
return 0;
oops:
return 0;
oops:
- saa7134_dma_free(
dev
,buf);
+ saa7134_dma_free(
q
,buf);
return err;
}
return err;
}
@@
-190,11
+190,9
@@
static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
{
static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
{
- struct saa7134_fh *fh = q->priv_data;
- struct saa7134_dev *dev = fh->dev;
struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
- saa7134_dma_free(
dev
,buf);
+ saa7134_dma_free(
q
,buf);
}
struct videobuf_queue_ops saa7134_vbi_qops = {
}
struct videobuf_queue_ops saa7134_vbi_qops = {