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

Commit 94384014 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8926e845

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -540,7 +540,7 @@ static int vidioc_enum_input(struct file *file, void *priv, 
			strcpy(vi->name, "Green Video Input");

			strcpy(vi->name, "Green Video Input");

		else

		else

			strcpy(vi->name, "Composite Video Input");

			strcpy(vi->name, "Composite Video Input");

		vi->std = V4L2_STD_PAL;

		vi->std = USBVISION_NORMS;

		break;

		break;

	case 2:

	case 2:

		vi->type = V4L2_INPUT_TYPE_CAMERA;

		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");

			strcpy(vi->name, "Yellow Video Input");

		else

		else

			strcpy(vi->name, "S-Video Input");

			strcpy(vi->name, "S-Video Input");

		vi->std = V4L2_STD_PAL;

		vi->std = USBVISION_NORMS;

		break;

		break;

	case 3:

	case 3:

		vi->type = V4L2_INPUT_TYPE_CAMERA;

		vi->type = V4L2_INPUT_TYPE_CAMERA;

		strcpy(vi->name, "Red Video Input");

		strcpy(vi->name, "Red Video Input");

		vi->std = V4L2_STD_PAL;

		vi->std = USBVISION_NORMS;

		break;

		break;

	}

	}

	return 0;

	return 0;