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 [thread overview]
Message-ID: <20191115223356.27675-19-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org>
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(-)
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;
}
--
2.17.1
next prev parent reply other threads:[~2019-11-15 22:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 22:33 [stable 4.19+][PATCH 01/20] i2c: stm32f7: fix first byte to send in slave mode Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 02/20] ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157 Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 03/20] mailbox: stm32_ipcc: add spinlock to fix channels concurrent access Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 04/20] crypto: stm31/hash - Fix hmac issue more than 256 bytes Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 05/20] media: stm32-dcmi: fix DMA corruption when stopping streaming Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 06/20] media: stm32-dcmi: fix check of pm_runtime_get_sync return value Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 07/20] hwrng: stm32 - fix unbalanced pm_runtime_enable Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 08/20] remoteproc: fix rproc_da_to_va in case of unallocated carveout Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 09/20] clk: stm32mp1: fix HSI divider flag Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 10/20] clk: stm32mp1: fix mcu divider table Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 11/20] clk: stm32mp1: add CLK_SET_RATE_NO_REPARENT to Kernel clocks Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 12/20] clk: stm32mp1: parent clocks update Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 13/20] mailbox: mailbox-test: fix null pointer if no mmio Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 14/20] pinctrl: stm32: fix memory leak issue Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 15/20] ASoC: stm32: i2s: fix dma configuration Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 16/20] ASoC: stm32: i2s: fix 16 bit format support Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 17/20] ASoC: stm32: i2s: fix IRQ clearing Mathieu Poirier
2019-11-15 22:33 ` [stable 4.19+][PATCH 18/20] ASoC: stm32: sai: add missing put_device() Mathieu Poirier
2019-11-15 22:33 ` Mathieu Poirier [this message]
2019-11-15 22:33 ` [stable 4.19+][PATCH 20/20] dmaengine: stm32-dma: check whether length is aligned on FIFO threshold Mathieu Poirier
2019-11-21 20:35 ` [stable 4.19+][PATCH 01/20] i2c: stm32f7: fix first byte to send in slave mode Greg KH
2019-11-22 16:27 ` Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191115223356.27675-19-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).