From 4c6bc1020c3dd74a75ab92e04d21275cd8f20165 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Mon, 6 Oct 2003 17:54:02 -0700 Subject: [PATCH] [PATCH] v4l: saa7146 driver update This adapts the saa7146 driver to the videobuf changes --- drivers/media/common/saa7146_vbi.c | 2 +- drivers/media/common/saa7146_video.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index fba63a1ac3487..19612d2fbe6ed 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c @@ -235,7 +235,7 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l saa7146_pgtable_free(dev->pci, &buf->pt[2]); saa7146_pgtable_alloc(dev->pci, &buf->pt[2]); - err = videobuf_iolock(dev->pci,&buf->vb); + err = videobuf_iolock(dev->pci,&buf->vb,NULL); if (err) goto oops; saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen); diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 15ceab5805abe..f027f6ce20802 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1090,7 +1090,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int q = &fh->video_q; down(&q->lock); - err = videobuf_mmap_setup(file,q,gbuffers,gbufsize); // ,V4L2_MEMORY_MMAP); + err = videobuf_mmap_setup(file,q,gbuffers,gbufsize, + V4L2_MEMORY_MMAP); if (err < 0) { up(&q->lock); return err; @@ -1185,7 +1186,7 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4 saa7146_pgtable_alloc(dev->pci, &buf->pt[0]); } - err = videobuf_iolock(dev->pci,&buf->vb); + err = videobuf_iolock(dev->pci,&buf->vb,NULL); if (err) goto oops; err = saa7146_pgtable_build(dev,buf); -- 2.53.0