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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 1DB15C432C0 for ; Fri, 22 Nov 2019 11:09:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAC2420718 for ; Fri, 22 Nov 2019 11:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420971; bh=N/hyzp1OWfb2l1l5eiOD5E610sSGkUzaZnDfc14bxfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ydZ2nQEfCIeSeVwBjhNKX09yrh8gMDQ5lh89jgSGLqvSwb/uRnQni7WBufM4Wq1Zh LkRFp7DDwUcHzJjczYFBlYcRQcZVyNaWG55CvcKhd+3Qu8zJ4UAE/Xn49WVoLdcs5U xsJYnWucKyebCys7gthn/3QkXc9STiQGDeU/Zfd0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731413AbfKVLDT (ORCPT ); Fri, 22 Nov 2019 06:03:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:57368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731412AbfKVLDS (ORCPT ); Fri, 22 Nov 2019 06:03:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1ECEF2073F; Fri, 22 Nov 2019 11:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420596; bh=N/hyzp1OWfb2l1l5eiOD5E610sSGkUzaZnDfc14bxfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p9uX2xNLo0vWTvSYPjqCF6ZRDzTnJ9/S1yBVPdz/K6kNYoL/Cj56iukjS3jfnEb7P Kxar59fOaLDC/jc8GYZ7CfiBMfBXS3p+5k6lL9nZM6oHG3eHzA355hMIxQ0CvemJ1w 0JD79p8XWtrtgJjOjQRpta1MthnPElWkewd7xcWc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hugues Fruchet , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 124/220] media: ov5640: fix framerate update Date: Fri, 22 Nov 2019 11:28:09 +0100 Message-Id: <20191122100921.669666315@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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