From patchwork Wed Mar 25 06:59:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsODwqltZXRoIE3Dg8KhcnRvbg==?= X-Patchwork-Id: 14254 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2P6xbkk019283 for ; Wed, 25 Mar 2009 06:59:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755449AbZCYG7h (ORCPT ); Wed, 25 Mar 2009 02:59:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755499AbZCYG7h (ORCPT ); Wed, 25 Mar 2009 02:59:37 -0400 Received: from mail00d.mail.t-online.hu ([84.2.42.5]:64741 "EHLO mail00d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755449AbZCYG7g (ORCPT ); Wed, 25 Mar 2009 02:59:36 -0400 Received: from [192.168.1.65] (dsl51B65935.pool.t-online.hu [81.182.89.53]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail00d.mail.t-online.hu (Postfix) with ESMTPSA id 6A43575872C; Wed, 25 Mar 2009 07:59:13 +0100 (CET) Message-ID: <49C9D652.5040104@freemail.hu> Date: Wed, 25 Mar 2009 07:59:30 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.16) Gecko/20080702 SeaMonkey/1.1.11 MIME-Version: 1.0 To: Laurent Pinchart , linux-media@vger.kernel.org CC: LKML Subject: [PATCH] uvcvideo: add zero fill for VIDIOC_ENUM_FMT X-DCC-mail.t-online.hu-Metrics: mail00d.mail.t-online.hu 32720; Body=3 Fuz1=3 Fuz2=3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh 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 --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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)