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

[media] au0828: replace deprecated current_norm by g_std 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8d86e4e8

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

+12 −1
Original line number Diff line number Diff line
@@ -1339,10 +1339,20 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm) 


	if (dev->dvb.frontend && dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl)

		dev->dvb.frontend->ops.analog_ops.i2c_gate_ctrl(dev->dvb.frontend, 0);

	dev->std = norm;



	return 0;

}



static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *norm)

{

	struct au0828_fh *fh = priv;

	struct au0828_dev *dev = fh->dev;



	*norm = dev->std;

	return 0;

}



static int vidioc_enum_input(struct file *file, void *priv,

				struct v4l2_input *input)

{
@@ -1890,6 +1900,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_qbuf                = vidioc_qbuf,

	.vidioc_dqbuf               = vidioc_dqbuf,

	.vidioc_s_std               = vidioc_s_std,

	.vidioc_g_std               = vidioc_g_std,

	.vidioc_enum_input          = vidioc_enum_input,

	.vidioc_g_input             = vidioc_g_input,

	.vidioc_s_input             = vidioc_s_input,
@@ -1914,7 +1925,6 @@ static const struct video_device au0828_video_template = { 
	.release                    = video_device_release,

	.ioctl_ops 		    = &video_ioctl_ops,

	.tvnorms                    = V4L2_STD_NTSC_M,

	.current_norm               = V4L2_STD_NTSC_M,

};



/**************************************************************************/
@@ -1983,6 +1993,7 @@ int au0828_analog_register(struct au0828_dev *dev, 
	dev->bytesperline = dev->width << 1;

	dev->ctrl_ainput = 0;

	dev->ctrl_freq = 960;

	dev->std = V4L2_STD_NTSC_M;



	/* allocate and fill v4l2 video struct */

	dev->vdev = video_device_alloc();

drivers/media/usb/au0828/au0828.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ struct au0828_dev { 
	int vbi_width;

	int vbi_height;

	u32 vbi_read;

	v4l2_std_id std;

	u32 field_size;

	u32 frame_size;

	u32 bytesperline;

CRA Git | Maintained and supported by SUSTech CRA and CCSE