From: Stelian Pop <stelian.pop@fr.alcove.com>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: kraxel@bytesex.org
Subject: [PATCH 2.5.8-pre1] motioneye video driver
Date: Thu, 4 Apr 2002 16:03:05 +0200 [thread overview]
Message-ID: <20020404140305.GH9820@come.alcove-fr> (raw)
In 2.5.8-pre1 'video_generic_ioctl' has gone, replaced by
'video_generic_ioctl'. However, no video driver has been
updated to use the new API.
The Gerd's patches from http://bytesex.org/patches/2.5/
must be applied.
Attached is the motioneye driver patch only, which I can
confirm it works properly.
Stelian.
===== drivers/media/video/meye.c 1.9 vs edited =====
--- 1.9/drivers/media/video/meye.c Thu Mar 14 17:16:34 2002
+++ edited/drivers/media/video/meye.c Thu Apr 4 11:08:17 2002
@@ -893,8 +893,8 @@
return 0;
}
-static int meye_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, void *arg) {
+static int meye_do_ioctl(struct inode *inode, struct file *file,
+ unsigned int cmd, void *arg) {
switch (cmd) {
@@ -1169,6 +1169,12 @@
return 0;
}
+static int meye_ioctl(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
+ return video_usercopy(inode, file, cmd, arg, meye_do_ioctl);
+}
+
static int meye_mmap(struct file *file, struct vm_area_struct *vma) {
unsigned long start = vma->vm_start;
unsigned long size = vma->vm_end - vma->vm_start;
@@ -1209,7 +1215,7 @@
open: meye_open,
release: meye_release,
mmap: meye_mmap,
- ioctl: video_generic_ioctl,
+ ioctl: meye_ioctl,
llseek: no_llseek,
};
@@ -1219,7 +1225,6 @@
type: VID_TYPE_CAPTURE,
hardware: VID_HARDWARE_MEYE,
fops: &meye_fops,
- kernel_ioctl: meye_ioctl,
};
static int __devinit meye_probe(struct pci_dev *pcidev,
--
Stelian Pop <stelian.pop@fr.alcove.com>
Alcove - http://www.alcove.com
next reply other threads:[~2002-04-04 14:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-04-04 14:03 Stelian Pop [this message]
2002-04-04 14:36 ` [PATCH 2.5.8-pre1] motioneye video driver Gerd Knorr
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=20020404140305.GH9820@come.alcove-fr \
--to=stelian.pop@fr.alcove.com \
--cc=kraxel@bytesex.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).