diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-23 16:37:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-23 16:37:49 -0300 |
| commit | 41a0d4ee71a7cc6c77dab97f0719c2f91a52e618 (patch) | |
| tree | 3bb43508fa2e96b0452daedb88723a1ff10288c4 /linux/drivers/media/video/saa7134/saa7134-vbi.c | |
| parent | 61da685dc15d30ab28f5a5de77ca79a2e4b3ef72 (diff) | |
| download | mediapointer-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/saa7134/saa7134-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-vbi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-vbi.c b/linux/drivers/media/video/saa7134/saa7134-vbi.c index 888656bc3..52f1ce90e 100644 --- a/linux/drivers/media/video/saa7134/saa7134-vbi.c +++ b/linux/drivers/media/video/saa7134/saa7134-vbi.c @@ -143,6 +143,8 @@ static int buffer_prepare(struct videobuf_queue *q, saa7134_dma_free(q,buf); if (STATE_NEEDS_INIT == buf->vb.state) { + struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); + buf->vb.width = llength; buf->vb.height = lines; buf->vb.size = size; @@ -152,8 +154,8 @@ static int buffer_prepare(struct videobuf_queue *q, if (err) goto oops; err = saa7134_pgtable_build(dev->pci,buf->pt, - buf->vb.dma.sglist, - buf->vb.dma.sglen, + dma->sglist, + dma->sglen, saa7134_buffer_startpage(buf)); if (err) goto oops; |