diff options
Diffstat (limited to 'include/media/v4l2-ioctl.h')
-rw-r--r-- | include/media/v4l2-ioctl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index 835af438e4f8..172c39678c5a 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
@@ -239,7 +239,7 @@ struct v4l2_ioctl_ops { | |||
239 | struct v4l2_frmivalenum *fival); | 239 | struct v4l2_frmivalenum *fival); |
240 | 240 | ||
241 | /* For other private ioctls */ | 241 | /* For other private ioctls */ |
242 | int (*vidioc_default) (struct file *file, void *fh, | 242 | long (*vidioc_default) (struct file *file, void *fh, |
243 | int cmd, void *arg); | 243 | int cmd, void *arg); |
244 | }; | 244 | }; |
245 | 245 | ||
@@ -277,10 +277,10 @@ extern const char *v4l2_field_names[]; | |||
277 | extern const char *v4l2_type_names[]; | 277 | extern const char *v4l2_type_names[]; |
278 | 278 | ||
279 | /* Compatibility layer interface -- v4l1-compat module */ | 279 | /* Compatibility layer interface -- v4l1-compat module */ |
280 | typedef int (*v4l2_kioctl)(struct file *file, | 280 | typedef long (*v4l2_kioctl)(struct file *file, |
281 | unsigned int cmd, void *arg); | 281 | unsigned int cmd, void *arg); |
282 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | 282 | #ifdef CONFIG_VIDEO_V4L1_COMPAT |
283 | int v4l_compat_translate_ioctl(struct file *file, | 283 | long v4l_compat_translate_ioctl(struct file *file, |
284 | int cmd, void *arg, v4l2_kioctl driver_ioctl); | 284 | int cmd, void *arg, v4l2_kioctl driver_ioctl); |
285 | #else | 285 | #else |
286 | #define v4l_compat_translate_ioctl(file, cmd, arg, ioctl) (-EINVAL) | 286 | #define v4l_compat_translate_ioctl(file, cmd, arg, ioctl) (-EINVAL) |
@@ -293,11 +293,11 @@ extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, | |||
293 | #endif | 293 | #endif |
294 | 294 | ||
295 | /* Include support for obsoleted stuff */ | 295 | /* Include support for obsoleted stuff */ |
296 | extern int video_usercopy(struct file *file, unsigned int cmd, | 296 | extern long video_usercopy(struct file *file, unsigned int cmd, |
297 | unsigned long arg, v4l2_kioctl func); | 297 | unsigned long arg, v4l2_kioctl func); |
298 | 298 | ||
299 | /* Standard handlers for V4L ioctl's */ | 299 | /* Standard handlers for V4L ioctl's */ |
300 | extern int video_ioctl2(struct file *file, | 300 | extern long video_ioctl2(struct file *file, |
301 | unsigned int cmd, unsigned long arg); | 301 | unsigned int cmd, unsigned long arg); |
302 | 302 | ||
303 | #endif /* _V4L2_IOCTL_H */ | 303 | #endif /* _V4L2_IOCTL_H */ |