From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 15 Feb 2013 09:07:13 +0000 (-0300)
Subject: [media] s2255: don't zero struct v4l2_streamparm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3c728118e00c42a177f9a5d0295b2a08591bddcb;p=openwrt%2Fstaging%2Fblogic.git

[media] s2255: don't zero struct v4l2_streamparm

All fields after 'type' are already zeroed by the core framework.
Clearing the full struct also clears 'type', which causes a wrong
type value to be returned.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 9693eb9d9e8d..eaae9d167e76 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -1476,7 +1476,6 @@ static int vidioc_g_parm(struct file *file, void *priv,
 	struct s2255_channel *channel = fh->channel;
 	if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 		return -EINVAL;
-	memset(sp, 0, sizeof(struct v4l2_streamparm));
 	sp->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
 	sp->parm.capture.capturemode = channel->cap_parm.capturemode;
 	def_num = (channel->mode.format == FORMAT_NTSC) ? 1001 : 1000;