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

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

[media] soc_camera: fix enum_input 



Fill in the std field from the video_device tvnorms field.

This fixes a v4l2-compliance failure.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarRob Taylor <rob.taylor@codethink.co.uk>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent fd41c1af

drivers/media/platform/soc_camera/soc_camera.c

+3 −0
Original line number Diff line number Diff line
@@ -309,11 +309,14 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, 
static int soc_camera_enum_input(struct file *file, void *priv,

				 struct v4l2_input *inp)

{

	struct soc_camera_device *icd = file->private_data;



	if (inp->index != 0)

		return -EINVAL;



	/* default is camera */

	inp->type = V4L2_INPUT_TYPE_CAMERA;

	inp->std = icd->vdev->tvnorms;

	strcpy(inp->name, "Camera");



	return 0;