summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-vbi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-23 16:37:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-23 16:37:49 -0300
commit41a0d4ee71a7cc6c77dab97f0719c2f91a52e618 (patch)
tree3bb43508fa2e96b0452daedb88723a1ff10288c4 /linux/drivers/media/video/cx88/cx88-vbi.c
parent61da685dc15d30ab28f5a5de77ca79a2e4b3ef72 (diff)
downloadmediapointer-dvb-s2-41a0d4ee71a7cc6c77dab97f0719c2f91a52e618.tar.gz
mediapointer-dvb-s2-41a0d4ee71a7cc6c77dab97f0719c2f91a52e618.tar.bz2
Adapt drivers to use the newer videobuf modules
PCI-dependent videobuf_foo methods were renamed as videobuf_pci_foo. Also, videobuf_dmabuf is now part of videobuf-dma-sg private struct. So, to access it, a subroutine call is needed. This patch renames all occurences of those function calls to be consistent with the video-buf split. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981 Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vbi.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-vbi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c
index 72c1d19fa..aa40505c4 100644
--- a/linux/drivers/media/video/cx88/cx88-vbi.c
+++ b/linux/drivers/media/video/cx88/cx88-vbi.c
@@ -172,6 +172,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
return -EINVAL;
if (STATE_NEEDS_INIT == buf->vb.state) {
+ struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
buf->vb.width = VBI_LINE_LENGTH;
buf->vb.height = VBI_LINE_COUNT;
buf->vb.size = size;
@@ -180,7 +181,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
goto fail;
cx88_risc_buffer(dev->pci, &buf->risc,
- buf->vb.dma.sglist,
+ dma->sglist,
0, buf->vb.width * buf->vb.height,
buf->vb.width, 0,
buf->vb.height);