diff options
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r-- | drivers/media/video/gspca/gspca.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 8b9f3bde5740..5e36b9a4ae3e 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
@@ -875,7 +875,7 @@ static void gspca_release(struct video_device *vfd) | |||
875 | kfree(gspca_dev); | 875 | kfree(gspca_dev); |
876 | } | 876 | } |
877 | 877 | ||
878 | static int dev_open(struct inode *inode, struct file *file) | 878 | static int dev_open(struct file *file) |
879 | { | 879 | { |
880 | struct gspca_dev *gspca_dev; | 880 | struct gspca_dev *gspca_dev; |
881 | int ret; | 881 | int ret; |
@@ -922,7 +922,7 @@ out: | |||
922 | return ret; | 922 | return ret; |
923 | } | 923 | } |
924 | 924 | ||
925 | static int dev_close(struct inode *inode, struct file *file) | 925 | static int dev_close(struct file *file) |
926 | { | 926 | { |
927 | struct gspca_dev *gspca_dev = file->private_data; | 927 | struct gspca_dev *gspca_dev = file->private_data; |
928 | 928 | ||
@@ -1802,17 +1802,13 @@ out: | |||
1802 | return ret; | 1802 | return ret; |
1803 | } | 1803 | } |
1804 | 1804 | ||
1805 | static struct file_operations dev_fops = { | 1805 | static struct v4l2_file_operations dev_fops = { |
1806 | .owner = THIS_MODULE, | 1806 | .owner = THIS_MODULE, |
1807 | .open = dev_open, | 1807 | .open = dev_open, |
1808 | .release = dev_close, | 1808 | .release = dev_close, |
1809 | .read = dev_read, | 1809 | .read = dev_read, |
1810 | .mmap = dev_mmap, | 1810 | .mmap = dev_mmap, |
1811 | .unlocked_ioctl = __video_ioctl2, | 1811 | .unlocked_ioctl = video_ioctl2, |
1812 | #ifdef CONFIG_COMPAT | ||
1813 | .compat_ioctl = v4l_compat_ioctl32, | ||
1814 | #endif | ||
1815 | .llseek = no_llseek, | ||
1816 | .poll = dev_poll, | 1812 | .poll = dev_poll, |
1817 | }; | 1813 | }; |
1818 | 1814 | ||