# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1191758912 -7200 # Node ID 988a7047d31bffbccb76bfc60b257bae51219e0b # Parent 14896a4d8f5d21d20b84dfd0a147c5a326f34599 v4l2_extension: fix 2 sparse warnings
- twice set .vidioc_g_audio as vidioc_g_audio and vidioc_s_audio (typo) - make v4l2ext_hlp_ioctl static
Signed-off-by: Jiri Slaby jirislaby@gmail.com
diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c @@ -36,7 +36,7 @@ static int helper_major; * Helper daemon interface operations */
-int v4l2ext_hlp_ioctl(struct inode *inode, struct file *file, +static int v4l2ext_hlp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { return 0; diff --git a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c @@ -509,7 +509,7 @@ static struct video_device v4l2ext_video .vidioc_s_input = vidioc_s_input, .vidioc_queryctrl = vidioc_queryctrl, .vidioc_g_audio = vidioc_g_audio, - .vidioc_g_audio = vidioc_s_audio, + .vidioc_s_audio = vidioc_s_audio, .vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_streamon = vidioc_streamon,