[stable,4.19+,19/20] media: ov5640: fix framerate update

Message ID	20191115223356.27675-19-mathieu.poirier@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Mathieu Poirier <mathieu.poirier@linaro.org> To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19+][PATCH 19/20] media: ov5640: fix framerate update Date: Fri, 15 Nov 2019 15:33:55 -0700 Message-Id: <20191115223356.27675-19-mathieu.poirier@linaro.org> In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	[stable,4.19+,01/20] i2c: stm32f7: fix first byte to send in slave mode \| expand [stable,4.19+,01/20] i2c: stm32f7: fix first byte to send in slave mode [stable,4.19+,02/20] ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 [stable,4.19+,03/20] mailbox: stm32_ipcc: add spinlock to fix channels concurrent access [stable,4.19+,04/20] crypto: stm31/hash - Fix hmac issue more than 256 bytes [stable,4.19+,06/20] media: stm32-dcmi: fix check of pm_runtime_get_sync return value [stable,4.19+,08/20] remoteproc: fix rproc_da_to_va in case of unallocated carveout [stable,4.19+,09/20] clk: stm32mp1: fix HSI divider flag [stable,4.19+,11/20] clk: stm32mp1: add CLK_SET_RATE_NO_REPARENT to Kernel clocks [stable,4.19+,14/20] pinctrl: stm32: fix memory leak issue [stable,4.19+,18/20] ASoC: stm32: sai: add missing put_device() [stable,4.19+,19/20] media: ov5640: fix framerate update

Message ID

20191115223356.27675-19-mathieu.poirier@linaro.org

State

New

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: stable@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [stable 4.19+][PATCH 19/20] media: ov5640: fix framerate update
Date: Fri, 15 Nov 2019 15:33:55 -0700
Message-Id: <20191115223356.27675-19-mathieu.poirier@linaro.org>
In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org>
References: <20191115223356.27675-1-mathieu.poirier@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

[stable,4.19+,01/20] i2c: stm32f7: fix first byte to send in slave mode | expand

Commit Message

Mathieu Poirier Nov. 15, 2019, 10:33 p.m. UTC

From: Hugues Fruchet <hugues.fruchet@st.com>


commit 0929983e49c81c1d413702cd9b83bb06c4a2555c upstream

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 <hugues.fruchet@st.com>

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

Cc: stable <stable@vger.kernel.org> # 4.19+
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

---
 drivers/media/i2c/ov5640.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
2.17.1

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index a3bbef682fb8..2023df14f828 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;
 	}

[stable,4.19+,19/20] media: ov5640: fix framerate update

Commit Message

Patch