From patchwork Fri Mar 26 16:14:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 88531 X-Patchwork-Delegate: mchehab@redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2QGEQoD011380 for ; Fri, 26 Mar 2010 16:14:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752418Ab0CZQOL (ORCPT ); Fri, 26 Mar 2010 12:14:11 -0400 Received: from tex.lwn.net ([70.33.254.29]:50452 "EHLO vena.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695Ab0CZQOK (ORCPT ); Fri, 26 Mar 2010 12:14:10 -0400 Received: from bike.lwn.net (c-71-196-136-44.hsd1.co.comcast.net [71.196.136.44]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by vena.lwn.net (Postfix) with ESMTP id 499A91540050; Fri, 26 Mar 2010 10:14:09 -0600 (MDT) Date: Fri, 26 Mar 2010 10:14:07 -0600 From: Jonathan Corbet To: Mauro Carvalho Chehab Cc: v4l-dvb Subject: Re: [PULL] ov7670 changes Message-ID: <20100326101407.431399c4@bike.lwn.net> In-Reply-To: <4BAC9BF4.4090104@infradead.org> References: <20100325131839.0a05f7cd@bike.lwn.net> <4BAC9BF4.4090104@infradead.org> Organization: LWN.net X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.0; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Mar 2010 16:14:26 +0000 (UTC) diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index a3fee6a..798b4c9 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -873,8 +873,7 @@ static int ov7670_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *parms) struct v4l2_captureparm *cp = &parms->parm.capture; struct v4l2_fract *tpf = &cp->timeperframe; struct ov7670_info *info = to_state(sd); - unsigned char clkrc; - int ret, div; + int div; if (parms->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; @@ -1280,9 +1279,9 @@ static int ov7670_g_autoexp(struct v4l2_subdev *sd, __s32 *value) ret = ov7670_read(sd, REG_COM8, &com8); if (com8 & COM8_AEC) - *value = V4L2_EXPOSURE_AUTO; + *atype = V4L2_EXPOSURE_AUTO; else - *value = V4L2_EXPOSURE_MANUAL; + *atype = V4L2_EXPOSURE_MANUAL; return ret; }