From: Gerd Knorr <kraxel@bytesex.org>
To: Linus Torvalds <torvalds@transmeta.com>,
Andrew Morton <akpm@digeo.com>,
Kernel List <linux-kernel@vger.kernel.org>
Subject: [patch] v4l: saa7146 driver update
Date: Tue, 7 Oct 2003 13:06:04 +0200 [thread overview]
Message-ID: <20031007110603.GA3649@bytesex.org> (raw)
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
reply other threads:[~2003-10-07 11:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20031007110603.GA3649@bytesex.org \
--to=kraxel@bytesex.org \
--cc=akpm@digeo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox