---

yaml --- r: 366510 b: refs/heads/master c: 3c72811 h: refs/heads/master v: v3
git-mirror · Mar 5, 2013 · d967b49 · d967b49
1 parent ee2e941
commit d967b49
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92513611fa5864b8aec216db5a93bafaa299d623
+refs/heads/master: 3c728118e00c42a177f9a5d0295b2a08591bddcb
diff --git a/trunk/drivers/media/usb/s2255/s2255drv.c b/trunk/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;