From patchwork Fri Aug 24 09:10:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 1370321 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 483313FC33 for ; Fri, 24 Aug 2012 09:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932590Ab2HXJKp (ORCPT ); Fri, 24 Aug 2012 05:10:45 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:51897 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757906Ab2HXJKi (ORCPT ); Fri, 24 Aug 2012 05:10:38 -0400 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3X3GtJ60Zqz3hhvG; Fri, 24 Aug 2012 11:10:32 +0200 (CEST) X-Auth-Info: qcEJUk9DchggeMV5wF4iInb292zjimwKYp9BhOEEJk0= Received: from localhost (p4FC461F2.dip.t-dialin.net [79.196.97.242]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA id 3X3GtJ4jm0zbbg6; Fri, 24 Aug 2012 11:10:32 +0200 (CEST) From: Anatolij Gustschin To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski , Mauro Carvalho Chehab , dzu@denx.de Subject: [PATCH 2/3] mt9v022: fix the V4L2_CID_EXPOSURE control Date: Fri, 24 Aug 2012 11:10:30 +0200 Message-Id: <1345799431-29426-3-git-send-email-agust@denx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1345799431-29426-1-git-send-email-agust@denx.de> References: <1345799431-29426-1-git-send-email-agust@denx.de> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Since the MT9V022_TOTAL_SHUTTER_WIDTH register is controlled in manual mode by V4L2_CID_EXPOSURE control, it shouldn't be written directly in mt9v022_s_crop(). In manual mode this register should be set to the V4L2_CID_EXPOSURE control value. Changing this register directly and outside of the actual control function means that the register value is not in sync with the corresponding control value. Thus, the following problem is observed: - setting this control initially succeeds - VIDIOC_S_CROP ioctl() overwrites the MT9V022_TOTAL_SHUTTER_WIDTH register - setting this control to the same value again doesn't result in setting the register since the control value was previously cached and doesn't differ Fix it by always setting the register to the controlled value, when in manual mode. Signed-off-by: Anatolij Gustschin --- drivers/media/i2c/soc_camera/mt9v022.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c index d13c8c4..d26c071 100644 --- a/drivers/media/i2c/soc_camera/mt9v022.c +++ b/drivers/media/i2c/soc_camera/mt9v022.c @@ -274,9 +274,9 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) if (ret & 1) /* Autoexposure */ ret = reg_write(client, mt9v022->reg->max_total_shutter_width, rect.height + mt9v022->y_skip_top + 43); - else - ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH, - rect.height + mt9v022->y_skip_top + 43); + else /* Set to the manually controlled value */ + ret = v4l2_ctrl_s_ctrl(mt9v022->exposure, + mt9v022->exposure->val); } /* Setup frame format: defaults apart from width and height */ if (!ret)