[PATCH] v4l2: fill reserved fields of VIDIOC_ENUMAUDIO also

From: Németh Márton
Date: Wed Mar 25 2009 - 12:52:02 EST


From: Márton Németh <nm127@xxxxxxxxxxx>

When enumerating audio inputs with VIDIOC_ENUMAUDIO the gspca_sunplus driver
does not fill the reserved fields of the struct v4l2_audio with zeros as
required by V4L2 API revision 0.24 [1]. Add the missing initializations to
the V4L2 framework.

The patch was tested with v4l-test 0.10 [2] with gspca_sunplus driver and
with Trust 610 LCD POWERC@M ZOOM webcam.

References:
[1] V4L2 API specification, revision 0.24
http://v4l2spec.bytesex.org/spec/r8242.htm

[2] v4l-test: Test environment for Video For Linux Two API
http://v4l-test.sourceforge.net/

Signed-off-by: Márton Németh <nm127@xxxxxxxxxxx>
---
--- linux-2.6.29/drivers/media/video/v4l2-ioctl.c.orig 2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/drivers/media/video/v4l2-ioctl.c 2009-03-25 17:11:27.000000000 +0100
@@ -1363,9 +1363,13 @@ static long __video_do_ioctl(struct file
case VIDIOC_ENUMAUDIO:
{
struct v4l2_audio *p = arg;
+ __u32 index = p->index;

if (!ops->vidioc_enumaudio)
break;
+
+ memset(p, 0, sizeof(*p));
+ p->index = index;
ret = ops->vidioc_enumaudio(file, fh, p);
if (!ret)
dbgarg(cmd, "index=%d, name=%s, capability=0x%x, "
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/