diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-17 08:52:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 02:05:09 -0300 |
| commit | 4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436 (patch) | |
| tree | 474b3c027e8a34699062cf2aff094e7f1a286799 /drivers/media | |
| parent | 35a303b1d788623939756136d85aecccf2d82686 (diff) | |
| download | op-kernel-dev-4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436.zip op-kernel-dev-4ceb04e1b1cf724b6ed805955adfbbdfa8a3d436.tar.gz | |
V4L/DVB (4112): Fix: videodev.c were cleaning the pointer, not the values
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/videodev.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/vivi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 3f7a94b..311149b 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 0aa54fb..269c1b1 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++) { |
