lkml.org 
[lkml]   [2003]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] v4l: saa7146 driver update
  Hi,

This patch adapts the saa7146 driver to the videobuf changes mailed
earier today.

Gerd

diff -u linux-2.6.0-test6/drivers/media/common/saa7146_vbi.c linux/drivers/media/common/saa7146_vbi.c
--- linux-2.6.0-test6/drivers/media/common/saa7146_vbi.c 2003-10-06 17:44:29.000000000 +0200
+++ linux/drivers/media/common/saa7146_vbi.c 2003-10-06 17:48:03.000000000 +0200
@@ -235,7 +235,7 @@
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 -u linux-2.6.0-test6/drivers/media/common/saa7146_video.c linux/drivers/media/common/saa7146_video.c
--- linux-2.6.0-test6/drivers/media/common/saa7146_video.c 2003-10-06 17:45:45.000000000 +0200
+++ linux/drivers/media/common/saa7146_video.c 2003-10-06 17:48:03.000000000 +0200
@@ -1090,7 +1090,8 @@

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 @@
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);
--
You have a new virus in /var/mail/kraxel
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:49    [from the cache]
©2003-2011 Jasper Spaans