diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 43ef7ba75c8b..97ed95957992 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -168,7 +168,7 @@ static const char *get_v4l_name(int v4l_type) | |||
168 | * This is part of Video 4 Linux API. The procedure handles ioctl() calls. | 168 | * This is part of Video 4 Linux API. The procedure handles ioctl() calls. |
169 | * | 169 | * |
170 | */ | 170 | */ |
171 | static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | 171 | static int __pvr2_v4l2_do_ioctl(struct file *file, |
172 | unsigned int cmd, void *arg) | 172 | unsigned int cmd, void *arg) |
173 | { | 173 | { |
174 | struct pvr2_v4l2_fh *fh = file->private_data; | 174 | struct pvr2_v4l2_fh *fh = file->private_data; |
@@ -863,8 +863,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | |||
863 | #endif | 863 | #endif |
864 | 864 | ||
865 | default : | 865 | default : |
866 | ret = v4l_compat_translate_ioctl(inode,file,cmd, | 866 | ret = v4l_compat_translate_ioctl(file, cmd, |
867 | arg,pvr2_v4l2_do_ioctl); | 867 | arg, __pvr2_v4l2_do_ioctl); |
868 | } | 868 | } |
869 | 869 | ||
870 | pvr2_hdw_commit_ctl(hdw); | 870 | pvr2_hdw_commit_ctl(hdw); |
@@ -890,6 +890,11 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | |||
890 | return ret; | 890 | return ret; |
891 | } | 891 | } |
892 | 892 | ||
893 | static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | ||
894 | unsigned int cmd, void *arg) | ||
895 | { | ||
896 | return __pvr2_v4l2_do_ioctl(file, cmd, arg); | ||
897 | } | ||
893 | 898 | ||
894 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) | 899 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) |
895 | { | 900 | { |