]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] stk-webcam: remove bogus STD support
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 4 Feb 2013 12:30:49 +0000 (09:30 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 5 Mar 2013 17:34:39 +0000 (14:34 -0300)
It's a webcam, the STD API is not applicable to webcams.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/stkwebcam/stk-webcam.c

index b2a5ee453a6a1f289ab74b9ea4029d37d9cf8258..e9dbe23122c37b1cf90fefdb5c9aff8058c1de1b 100644 (file)
@@ -806,12 +806,6 @@ static int stk_vidioc_s_input(struct file *filp, void *priv, unsigned int i)
                return 0;
 }
 
-/* from vivi.c */
-static int stk_vidioc_s_std(struct file *filp, void *priv, v4l2_std_id *a)
-{
-       return 0;
-}
-
 /* List of all V4Lv2 controls supported by the driver */
 static struct v4l2_queryctrl stk_controls[] = {
        {
@@ -1263,7 +1257,6 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
        .vidioc_enum_input = stk_vidioc_enum_input,
        .vidioc_s_input = stk_vidioc_s_input,
        .vidioc_g_input = stk_vidioc_g_input,
-       .vidioc_s_std = stk_vidioc_s_std,
        .vidioc_reqbufs = stk_vidioc_reqbufs,
        .vidioc_querybuf = stk_vidioc_querybuf,
        .vidioc_qbuf = stk_vidioc_qbuf,
@@ -1289,8 +1282,6 @@ static void stk_v4l_dev_release(struct video_device *vd)
 
 static struct video_device stk_v4l_data = {
        .name = "stkwebcam",
-       .tvnorms = V4L2_STD_UNKNOWN,
-       .current_norm = V4L2_STD_UNKNOWN,
        .fops = &v4l_stk_fops,
        .ioctl_ops = &v4l_stk_ioctl_ops,
        .release = stk_v4l_dev_release,