[PATCH 14/15] em28xx: zero vbi_format reserved array and add try_vbi_fmt.

[Devin Heitmueller]

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
Signed-off-by: Devin Heitmueller <dheitmuel...@kernellabs.com>
---
 drivers/media/usb/em28xx/em28xx-video.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/usb/em28xx/em28xx-video.c 
b/drivers/media/usb/em28xx/em28xx-video.c
index 1514b27..3adaa7b 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -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,
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html