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

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

[media] em28xx: zero vbi_format reserved array and add try_vbi_fmt 



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

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

+3 −0
Original line number Diff line number Diff line
@@ -1521,6 +1521,7 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv, 
	format->fmt.vbi.sampling_rate = 6750000 * 4 / 2;

	format->fmt.vbi.count[0] = dev->vbi_height;

	format->fmt.vbi.count[1] = dev->vbi_height;

	memset(format->fmt.vbi.reserved, 0, sizeof(format->fmt.vbi.reserved));



	/* Varies by video standard (NTSC, PAL, etc.) */

	if (dev->norm & V4L2_STD_525_60) {
@@ -1549,6 +1550,7 @@ static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv, 
	format->fmt.vbi.sampling_rate = 6750000 * 4 / 2;

	format->fmt.vbi.count[0] = dev->vbi_height;

	format->fmt.vbi.count[1] = dev->vbi_height;

	memset(format->fmt.vbi.reserved, 0, sizeof(format->fmt.vbi.reserved));



	/* Varies by video standard (NTSC, PAL, etc.) */

	if (dev->norm & V4L2_STD_525_60) {
@@ -1991,6 +1993,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_try_fmt_vid_cap     = vidioc_try_fmt_vid_cap,

	.vidioc_s_fmt_vid_cap       = vidioc_s_fmt_vid_cap,

	.vidioc_g_fmt_vbi_cap       = vidioc_g_fmt_vbi_cap,

	.vidioc_try_fmt_vbi_cap     = vidioc_g_fmt_vbi_cap,

	.vidioc_s_fmt_vbi_cap       = vidioc_s_fmt_vbi_cap,

	.vidioc_enum_framesizes     = vidioc_enum_framesizes,

	.vidioc_g_audio             = vidioc_g_audio,