From 104664f52fda3460fd14578b180bd1899a26049c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sat, 17 Jun 2006 08:52:30 -0300
Subject: [PATCH] --- yaml --- r: 30010 b: refs/heads/master c:
 4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/videodev.c | 2 +-
 trunk/drivers/media/video/vivi.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 980e8ed197e0..7e059e8b9ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35a303b1d788623939756136d85aecccf2d82686
+refs/heads/master: 4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436
diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c
index 3f7a94b80c63..311149b80e9f 100644
--- a/trunk/drivers/media/video/videodev.c
+++ b/trunk/drivers/media/video/videodev.c
@@ -734,7 +734,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 	{
 		struct video_mbuf *p=arg;
 
-		memset(&p,0,sizeof(p));
+		memset(p,0,sizeof(p));
 
 		if (!vfd->vidiocgmbuf)
 			break;
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 0aa54fb7727f..269c1b14cac5 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1000,7 +1000,7 @@ static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)
 	ret = videobuf_reqbufs(q,&req);
 	if (ret < 0)
 		return (ret);
-	memset(mbuf,0,sizeof(*mbuf));
+
 	mbuf->frames = req.count;
 	mbuf->size   = 0;
 	for (i = 0; i < mbuf->frames; i++) {