1 --- ov51x-jpeg-1.5.9-old/ov51x-jpeg-core.c 2010-12-22 17:14:55.000000000 +0100
2 +++ ov51x-jpeg-1.5.9/ov51x-jpeg-core.c 2010-12-22 17:10:14.000000000 +0100
4 static int sensor_get_picture(struct usb_ov511 *, struct video_picture *);
5 static int sensor_get_exposure(struct usb_ov511 *, unsigned char *);
6 static int ov51x_check_snapshot(struct usb_ov511 *);
7 -static int ov51x_control_ioctl(struct inode *, struct file *, unsigned int,
8 +static long ov51x_control_ioctl(struct inode *, struct file *, unsigned int,
11 static struct file_operations ov511_control_fops = {
12 - .ioctl = ov51x_control_ioctl,
13 + .unlocked_ioctl = ov51x_control_ioctl,
15 .compat_ioctl = v4l2_compat_ioctl32,
19 #endif /* OV511_OLD_V4L */
23 ov51x_control_ioctl(struct inode *inode, struct file *file, unsigned int cmd,