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

[media] cx231xx: remove current_norm usage 



The use of this field is deprecated since it will not work when multiple
device nodes reference the same video input (the video and vbi nodes in
this case). The norm field should be a device-global value.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1d08a4fa

drivers/media/usb/cx231xx/cx231xx-417.c

+0 −1
Original line number Diff line number Diff line
@@ -2115,7 +2115,6 @@ static struct video_device cx231xx_mpeg_template = { 
	.ioctl_ops     = &mpeg_ioctl_ops,

	.minor         = -1,

	.tvnorms       = CX231xx_NORMS,

	.current_norm  = V4L2_STD_NTSC_M,

};



void cx231xx_417_unregister(struct cx231xx *dev)

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

+1 −2
Original line number Diff line number Diff line
@@ -2230,7 +2230,6 @@ static const struct video_device cx231xx_video_template = { 
	.release      = video_device_release,

	.ioctl_ops    = &video_ioctl_ops,

	.tvnorms      = V4L2_STD_ALL,

	.current_norm = V4L2_STD_PAL,

};



static const struct v4l2_file_operations radio_fops = {
@@ -2301,7 +2300,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) 
		     dev->name, CX231XX_VERSION);



	/* set default norm */

	/*dev->norm = cx231xx_video_template.current_norm; */

	dev->norm = V4L2_STD_PAL;

	dev->width = norm_maxw(dev);

	dev->height = norm_maxh(dev);

	dev->interlaced = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE