1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 30781b82b6b5..2a80caa54fb4 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -673,11 +673,17 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
         {
                 struct v4l2_fmtdesc *fmt = arg;
                 struct uvc_format *format;
+                enum v4l2_buf_type type = fmt->type;
+                __u32 index = fmt->index;
 
                 if (fmt->type != video->streaming->type ||
                     fmt->index >= video->streaming->nformats)
                         return -EINVAL;
 
+                memset(fmt, 0, sizeof(*fmt));
+                fmt->index = index;
+                fmt->type = type;
+
                 format = &video->streaming->format[fmt->index];
                 fmt->flags = 0;
                 if (format->flags & UVC_FMT_FLAG_COMPRESSED)