summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l1-compat.c
diff options
context:
space:
mode:
authoraudetto@tiscali.it <audetto@tiscali.it>2006-11-20 22:27:44 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 12:05:01 +0100
commit499c18698990463b84c23ddc98104517fe759ee8 (patch)
tree3a6d63605c294279b33ee017f4856926158594c7 /drivers/media/video/v4l1-compat.c
parentV4L/DVB (4861): Remove the need of a STD array for drivers using video_ioctl2 (diff)
downloadlinux-499c18698990463b84c23ddc98104517fe759ee8.tar.xz
linux-499c18698990463b84c23ddc98104517fe759ee8.zip
V4L/DVB (4862): Fixes uninitialized variables passed to VIDIOC_G_FBUF.
Signed-off-by: Andrea A Odetti <audetto@tiscali.it> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/v4l1-compat.c')
-rw-r--r--drivers/media/video/v4l1-compat.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 701856e6adbf..8a13e595304e 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -350,6 +350,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
struct video_buffer *buffer = arg;
memset(buffer, 0, sizeof(*buffer));
+ memset(&fbuf2, 0, sizeof(fbuf2));
err = drv(inode, file, VIDIOC_G_FBUF, &fbuf2);
if (err < 0) {
@@ -616,6 +617,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
case VIDIOCSPICT: /* set tone controls & partial capture format */
{
struct video_picture *pict = arg;
+ memset(&fbuf2, 0, sizeof(fbuf2));
set_v4l_control(inode, file,
V4L2_CID_BRIGHTNESS, pict->brightness, drv);