Commit 21c5406e authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 245ba61e 4e995d5a
...@@ -893,7 +893,7 @@ static int meye_release(struct inode *inode, struct file *file) { ...@@ -893,7 +893,7 @@ static int meye_release(struct inode *inode, struct file *file) {
return 0; return 0;
} }
static int meye_ioctl(struct inode *inode, struct file *file, static int meye_do_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *arg) { unsigned int cmd, void *arg) {
switch (cmd) { switch (cmd) {
...@@ -1169,6 +1169,12 @@ static int meye_ioctl(struct inode *inode, struct file *file, ...@@ -1169,6 +1169,12 @@ static int meye_ioctl(struct inode *inode, struct file *file,
return 0; 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) { static int meye_mmap(struct file *file, struct vm_area_struct *vma) {
unsigned long start = vma->vm_start; unsigned long start = vma->vm_start;
unsigned long size = vma->vm_end - vma->vm_start; unsigned long size = vma->vm_end - vma->vm_start;
...@@ -1209,7 +1215,7 @@ static struct file_operations meye_fops = { ...@@ -1209,7 +1215,7 @@ static struct file_operations meye_fops = {
open: meye_open, open: meye_open,
release: meye_release, release: meye_release,
mmap: meye_mmap, mmap: meye_mmap,
ioctl: video_generic_ioctl, ioctl: meye_ioctl,
llseek: no_llseek, llseek: no_llseek,
}; };
...@@ -1219,7 +1225,6 @@ static struct video_device meye_template = { ...@@ -1219,7 +1225,6 @@ static struct video_device meye_template = {
type: VID_TYPE_CAPTURE, type: VID_TYPE_CAPTURE,
hardware: VID_HARDWARE_MEYE, hardware: VID_HARDWARE_MEYE,
fops: &meye_fops, fops: &meye_fops,
kernel_ioctl: meye_ioctl,
}; };
static int __devinit meye_probe(struct pci_dev *pcidev, static int __devinit meye_probe(struct pci_dev *pcidev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment