[media] usbvision: fix standards for S-Video/Composite inputs

The standards supported by S-Video and Composite inputs are not
limited by PAL, so make it more generic.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index a5e82c08f13f57adcdcee66367d8a04f139acac0..6ad3d568d495a33b8c2eacef251cf555ee51674b 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -540,7 +540,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
                        strcpy(vi->name, "Green Video Input");
                else
                        strcpy(vi->name, "Composite Video Input");
-               vi->std = V4L2_STD_PAL;
+               vi->std = USBVISION_NORMS;
                break;
        case 2:
                vi->type = V4L2_INPUT_TYPE_CAMERA;
@@ -548,12 +548,12 @@ static int vidioc_enum_input(struct file *file, void *priv,
                        strcpy(vi->name, "Yellow Video Input");
                else
                        strcpy(vi->name, "S-Video Input");
-               vi->std = V4L2_STD_PAL;
+               vi->std = USBVISION_NORMS;
                break;
        case 3:
                vi->type = V4L2_INPUT_TYPE_CAMERA;
                strcpy(vi->name, "Red Video Input");
-               vi->std = V4L2_STD_PAL;
+               vi->std = USBVISION_NORMS;
                break;
        }
        return 0;