From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74AD7C004C9 for ; Tue, 7 May 2019 05:50:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3ED96205ED for ; Tue, 7 May 2019 05:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208234; bh=mybmYd28yC+E0RdWF+IdtO+ykCH8Uoyv3hzAE4MP8r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PxLz05HKSAKcVV9W3Fo5TViAK0wqyKOwlvVHyQ8EkRoHoa0OYM+9NJv+IDKtH+SFv UMdCGYL2GJfwAF4BVW1LRBoB+r0Nne4sYZkPPZ6ugZoqhZS76mfmyel2n2EXQ1x6YH cyyrFyZOMV34/KgRwHGJk2pFSDS1i2TYLzy1zLsw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728699AbfEGFkH (ORCPT ); Tue, 7 May 2019 01:40:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:59606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728214AbfEGFkG (ORCPT ); Tue, 7 May 2019 01:40:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D8B0B216C8; Tue, 7 May 2019 05:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207605; bh=mybmYd28yC+E0RdWF+IdtO+ykCH8Uoyv3hzAE4MP8r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iYQLF4/eZXZwTdnl7agelMIGS/gAJI1Z2vm+TwAVpY6Hj8a6kll6pZ+RkI+f8K94t /flh3XIYBxwNiEXMKFznRJnhNra2IG+ULajaZ+U8T0xchGDo4m0e+ZpbHA/0Lz3Ejw cJxrP/BM8Tnjr4jr4nGIrEIQblY3Sz4BhjVZ/LD0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hugues Fruchet , Jacopo Mondi , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 52/95] media: ov5640: fix auto controls values when switching to manual mode Date: Tue, 7 May 2019 01:37:41 -0400 Message-Id: <20190507053826.31622-52-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hugues Fruchet [ Upstream commit a8f438c684eaa4cbe6c98828eb996d5ec53e24fb ] When switching from auto to manual mode, V4L2 core is calling g_volatile_ctrl() in manual mode in order to get the manual initial value. Remove the manual mode check/return to not break this behaviour. Signed-off-by: Hugues Fruchet Tested-by: Jacopo Mondi Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov5640.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 0366c8dc6ecf..acf5c8a55bbd 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -1900,16 +1900,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_AUTOGAIN: - if (!ctrl->val) - return 0; val = ov5640_get_gain(sensor); if (val < 0) return val; sensor->ctrls.gain->val = val; break; case V4L2_CID_EXPOSURE_AUTO: - if (ctrl->val == V4L2_EXPOSURE_MANUAL) - return 0; val = ov5640_get_exposure(sensor); if (val < 0) return val; -- 2.20.1