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

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

[media] mcam-core: replace current_norm by g_std 



The current_norm field is deprecated, replace this by properly
implementing g_std.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0dc5d82d

drivers/media/platform/marvell-ccic/mcam-core.c

+7 −1
Original line number Diff line number Diff line
@@ -1344,6 +1344,12 @@ static int mcam_vidioc_s_std(struct file *filp, void *priv, v4l2_std_id a) 
	return 0;

}



static int mcam_vidioc_g_std(struct file *filp, void *priv, v4l2_std_id *a)

{

	*a = V4L2_STD_NTSC_M;

	return 0;

}



/*

 * G/S_PARM.  Most of this is done by the sensor, but we are

 * the level which controls the number of read buffers.
@@ -1433,6 +1439,7 @@ static const struct v4l2_ioctl_ops mcam_v4l_ioctl_ops = { 
	.vidioc_g_input		= mcam_vidioc_g_input,

	.vidioc_s_input		= mcam_vidioc_s_input,

	.vidioc_s_std		= mcam_vidioc_s_std,

	.vidioc_g_std		= mcam_vidioc_g_std,

	.vidioc_reqbufs		= mcam_vidioc_reqbufs,

	.vidioc_querybuf	= mcam_vidioc_querybuf,

	.vidioc_qbuf		= mcam_vidioc_qbuf,
@@ -1558,7 +1565,6 @@ static const struct v4l2_file_operations mcam_v4l_fops = { 
static struct video_device mcam_v4l_template = {

	.name = "mcam",

	.tvnorms = V4L2_STD_NTSC_M,

	.current_norm = V4L2_STD_NTSC_M,  /* make mplayer happy */



	.fops = &mcam_v4l_fops,

	.ioctl_ops = &mcam_v4l_ioctl_ops,