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/drivers/media/video/cx18 | |
| 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/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index 6cde2a7fa..4529f26b0 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -860,7 +860,7 @@ static int cx18_log_status(struct file *file, void *fh) return 0; } -static int cx18_default(struct file *file, void *fh, int cmd, void *arg) +static long cx18_default(struct file *file, void *fh, int cmd, void *arg) { struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; @@ -888,13 +888,13 @@ static int cx18_default(struct file *file, void *fh, int cmd, void *arg) return 0; } -int cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, +long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct video_device *vfd = video_devdata(filp); struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data; struct cx18 *cx = id->cx; - int res; + long res; mutex_lock(&cx->serialize_lock); diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.h b/linux/drivers/media/video/cx18/cx18-ioctl.h index 50b8d6056..e2ca0d152 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.h +++ b/linux/drivers/media/video/cx18/cx18-ioctl.h @@ -29,5 +29,5 @@ void cx18_set_funcs(struct video_device *vdev); int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std); int cx18_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf); int cx18_s_input(struct file *file, void *fh, unsigned int inp); -int cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, +long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); |