Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4d6375 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

usbvision-video: buggered method tables 



duplicated .mmap in one, .vidioc_s_audio misspelled as .vidioc_g_audio
in other

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53098091

drivers/media/video/usbvision/usbvision-video.c

+2 −3
Original line number Diff line number Diff line
@@ -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,