mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-05 18:59:58 +00:00
usbvision-video: buggered method tables
duplicated .mmap in one, .vidioc_s_audio misspelled as .vidioc_g_audio in other Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5309809129
commit
ed4d6375a1
1 changed files with 2 additions and 3 deletions
|
@ -1387,7 +1387,6 @@ static const struct file_operations usbvision_fops = {
|
|||
.ioctl = video_ioctl2,
|
||||
.llseek = no_llseek,
|
||||
/* .poll = video_poll, */
|
||||
.mmap = usbvision_v4l2_mmap,
|
||||
.compat_ioctl = v4l_compat_ioctl32,
|
||||
};
|
||||
static struct video_device usbvision_video_template = {
|
||||
|
@ -1413,7 +1412,7 @@ static struct video_device usbvision_video_template = {
|
|||
.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,
|
||||
|
@ -1459,7 +1458,7 @@ static struct video_device usbvision_radio_template=
|
|||
.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_g_tuner = vidioc_g_tuner,
|
||||
|
|
Loading…
Reference in a new issue