summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-17 13:52:30 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 07:05:09 +0200
commit4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436 (patch)
tree474b3c027e8a34699062cf2aff094e7f1a286799
parentV4L/DVB (4110): Small bug in saa7127.c (diff)
downloadlinux-4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436.tar.xz
linux-4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436.zip
V4L/DVB (4112): Fix: videodev.c were cleaning the pointer, not the values
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/videodev.c2
-rw-r--r--drivers/media/video/vivi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 3f7a94b80c63..311149b80e9f 100644
--- a/drivers/media/video/videodev.c
+++ b/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/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 0aa54fb7727f..269c1b14cac5 100644
--- a/drivers/media/video/vivi.c
+++ b/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++) {