2007-09-26 00:53:57

by Al Viro

Subject: [PATCH] usbvision-video: buggered method tables

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

Signed-off-by: Al Viro <[email protected]>
---
drivers/media/video/usbvision/usbvision-video.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index e3371f9..0cb006f 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -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,
--
1.5.3.GIT

2007-09-26 13:04:00

by Mauro Carvalho Chehab

Subject: Re: [PATCH] usbvision-video: buggered method tables

Em Qua, 2007-09-26 às 01:53 +0100, Al Viro escreveu:
> duplicated .mmap in one, .vidioc_s_audio misspelled as .vidioc_g_audio
> in other
>
> Signed-off-by: Al Viro <[email protected]>

Acked-by: Mauro Carvalho Chehab <[email protected]>

> ---
> drivers/media/video/usbvision/usbvision-video.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
> index e3371f9..0cb006f 100644
> --- a/drivers/media/video/usbvision/usbvision-video.c
> +++ b/drivers/media/video/usbvision/usbvision-video.c
> @@ -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,
--
Cheers,
Mauro