diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:15:43 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:40:33 -0500 |
| commit | 92ab7886119da6375a983713eedab444e32094f6 (patch) | |
| tree | a17583daee778c35ff3013a04cabdbe8891411cd /include | |
| parent | 902571aaa91263bc27e923e94ddf161c106befee (diff) | |
V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
This patch fixes this warning:
drivers/media/video/gspca/gspca.c:1811: warning: initialization from incompatible pointer type
The reason is that the returned argument should be a long, not an
integer.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/v4l2-ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index c884432f9383..fcdb58c4ce07 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h | |||
| @@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd, | |||
| 297 | /* Standard handlers for V4L ioctl's */ | 297 | /* Standard handlers for V4L ioctl's */ |
| 298 | 298 | ||
| 299 | /* This prototype is used on fops.unlocked_ioctl */ | 299 | /* This prototype is used on fops.unlocked_ioctl */ |
| 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 | /* This prototype is used on fops.ioctl | 303 | /* This prototype is used on fops.ioctl |