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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 4033EC17440 for ; Wed, 13 Nov 2019 01:53:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F1EF222CD for ; Wed, 13 Nov 2019 01:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610021; bh=N/hyzp1OWfb2l1l5eiOD5E610sSGkUzaZnDfc14bxfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ReazAIPs4pxchoaTchI9jQVnJPeL+M19pL+JjFccOGHERqSS5QRDklhw7INuVgwTW L6KMwRWopi09Hsw1qklL4OoaCkwOgoIZwQS+XajMr3sU6kIG+78eBN4SjV7HmIMOzc 8aRy8tHNcCmzvsTcKmSU70CfhzAJcBkzh/U78+jw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728642AbfKMBxk (ORCPT ); Tue, 12 Nov 2019 20:53:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:43178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728578AbfKMBx3 (ORCPT ); Tue, 12 Nov 2019 20:53:29 -0500 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 D252B22459; Wed, 13 Nov 2019 01:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610008; bh=N/hyzp1OWfb2l1l5eiOD5E610sSGkUzaZnDfc14bxfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzypswrEudbrDwGUjGJNpVJAOAA+19EAjxGSbndPUYnOeO6T8QweGN8/cBIRQWeh7 GWcsWuPZba28NEmF2X4wB52nzCvfTsXQQN94Btanni/LJX3dww0RnT+8NY5hk9bK+o MyHN+c07sFcmwVC76imrWx0FoJC6gXHMWBr1pYYI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hugues Fruchet , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 113/209] media: ov5640: fix framerate update Date: Tue, 12 Nov 2019 20:48:49 -0500 Message-Id: <20191113015025.9685-113-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015025.9685-1-sashal@kernel.org> References: <20191113015025.9685-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hugues Fruchet [ Upstream commit 0929983e49c81c1d413702cd9b83bb06c4a2555c ] Changing framerate right before streamon had no effect, the new framerate value was taken into account only at next streamon, fix this. Signed-off-by: Hugues Fruchet Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov5640.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index a3bbef682fb8e..2023df14f8282 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -2572,8 +2572,6 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, if (frame_rate < 0) frame_rate = OV5640_15_FPS; - sensor->current_fr = frame_rate; - sensor->frame_interval = fi->interval; mode = ov5640_find_mode(sensor, frame_rate, mode->hact, mode->vact, true); if (!mode) { @@ -2581,7 +2579,10 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd, goto out; } - if (mode != sensor->current_mode) { + if (mode != sensor->current_mode || + frame_rate != sensor->current_fr) { + sensor->current_fr = frame_rate; + sensor->frame_interval = fi->interval; sensor->current_mode = mode; sensor->pending_mode_change = true; } -- 2.20.1