diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 11:04:34 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 11:04:34 +0100 |
| commit | 3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a (patch) | |
| tree | 8cde9ec972e040278b2fe93aab4509355409cb4d /linux/include/media/v4l2-dev.h | |
| parent | db66abb56195fcfe907beec7b9a3d29278306256 (diff) | |
| download | mediapointer-dvb-s2-3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a.tar.gz mediapointer-dvb-s2-3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a.tar.bz2 | |
v4l2-ioctl: change to long return type to match unlocked_ioctl.
From: Hans Verkuil <hverkuil@xs4all.nl>
Since internal to v4l2 the ioctl prototype is the same regardless of it
being called through .ioctl or .unlocked_ioctl, we need to convert it all
to the long return type of unlocked_ioctl.
Thanks to Jean-Francois Moine for posting an initial patch for this and
thus bringing it to our attention.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
CC: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index baa0c21d4..96b4ea2d9 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -38,7 +38,7 @@ struct v4l2_file_operations { ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); unsigned int (*poll) (struct file *, struct poll_table_struct *); - int (*ioctl) (struct file *, unsigned int, unsigned long); + long (*ioctl) (struct file *, unsigned int, unsigned long); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *); int (*open) (struct file *); |