Linux Media Controller development
 help / color / mirror / Atom feed
From: "Németh Márton" <nm127@freemail.hu>
To: Laurent Pinchart <laurent.pinchart@skynet.be>,
	linux-media@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] uvcvideo: add zero fill for VIDIOC_ENUM_FMT
Date: Wed, 25 Mar 2009 07:59:30 +0100	[thread overview]
Message-ID: <49C9D652.5040104@freemail.hu> (raw)

From: Márton Németh <nm127@freemail.hu>

When enumerating formats with VIDIOC_ENUM_FMT the uvcvideo driver does not
fill the reserved fields of the struct v4l2_fmtdesc with zeros as required by
V4L2 API revision 0.24 [1]. Add the missing initializations.

The patch was tested with v4l-test 0.10 [2] with CNF7129 webcam found on EeePC
901.

References:
[1] V4L2 API specification, revision 0.24
    http://v4l2spec.bytesex.org/spec/r8367.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@freemail.hu>
---
--- linux-2.6.29/drivers/media/video/uvc/uvc_v4l2.c.orig	2009-03-24 00:12:14.000000000 +0100
+++ linux-2.6.29/drivers/media/video/uvc/uvc_v4l2.c	2009-03-25 07:24:42.000000000 +0100
@@ -673,11 +673,19 @@ static long uvc_v4l2_do_ioctl(struct fil
 	{
 		struct v4l2_fmtdesc *fmt = arg;
 		struct uvc_format *format;
+		__u32 index;
+		enum v4l2_buf_type type;

 		if (fmt->type != video->streaming->type ||
 		    fmt->index >= video->streaming->nformats)
 			return -EINVAL;

+		index = fmt->index;
+		type = fmt->type;
+		memset(fmt, 0, sizeof(*fmt));
+		fmt->index = index;
+		fmt->type = type;
+
 		format = &video->streaming->format[fmt->index];
 		fmt->flags = 0;
 		if (format->flags & UVC_FMT_FLAG_COMPRESSED)

             reply	other threads:[~2009-03-25  6:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-25  6:59 Németh Márton [this message]
2009-03-25  7:12 ` [PATCH] uvcvideo: add zero fill for VIDIOC_ENUM_FMT Hans Verkuil
2009-03-27 14:15 ` Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49C9D652.5040104@freemail.hu \
    --to=nm127@freemail.hu \
    --cc=laurent.pinchart@skynet.be \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox