From: Hans Verkuil <hans.verk...@cisco.com>

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.verk...@cisco.com>
---
 drivers/media/usb/usbvision/usbvision-video.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/usbvision/usbvision-video.c 
b/drivers/media/usb/usbvision/usbvision-video.c
index a5e82c0..6ad3d56 100644
--- 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;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to