linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Bobrowicz <sam@elite-embedded.com>
To: linux-media@vger.kernel.org
Cc: Sam Bobrowicz <sam@elite-embedded.com>
Subject: [PATCH 1/4] media: ov5640: fix resolution update
Date: Mon,  8 Oct 2018 23:47:59 -0700	[thread overview]
Message-ID: <1539067682-60604-2-git-send-email-sam@elite-embedded.com> (raw)
In-Reply-To: <1539067682-60604-1-git-send-email-sam@elite-embedded.com>

set_fmt was not properly triggering a mode change when
a new mode was set that happened to have the same format
as the previous mode (for example, when only changing the
frame dimensions). Fix this.

Signed-off-by: Sam Bobrowicz <sam@elite-embedded.com>
---
 drivers/media/i2c/ov5640.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index eaefdb5..5031aab 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -2045,12 +2045,12 @@ static int ov5640_set_fmt(struct v4l2_subdev *sd,
 		goto out;
 	}
 
-	if (new_mode != sensor->current_mode) {
+
+	if (new_mode != sensor->current_mode ||
+	    mbus_fmt->code != sensor->fmt.code) {
+		sensor->fmt = *mbus_fmt;
 		sensor->current_mode = new_mode;
 		sensor->pending_mode_change = true;
-	}
-	if (mbus_fmt->code != sensor->fmt.code) {
-		sensor->fmt = *mbus_fmt;
 		sensor->pending_fmt_change = true;
 	}
 out:
-- 
2.7.4

  reply	other threads:[~2018-10-09 14:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-09  6:47 [PATCH 0/4] ov5640: small fixes for compatibility Sam Bobrowicz
2018-10-09  6:47 ` Sam Bobrowicz [this message]
2018-10-10 10:58   ` [PATCH 1/4] media: ov5640: fix resolution update jacopo mondi
2018-10-10 12:41     ` Laurent Pinchart
2018-10-15 15:13       ` Hugues FRUCHET
2018-10-15 15:24         ` jacopo mondi
2018-10-16  8:49           ` Hugues FRUCHET
2018-10-16 12:15         ` Laurent Pinchart
2018-10-16 18:14           ` Samuel Bobrowicz
2018-10-09  6:48 ` [PATCH 2/4] media: ov5640: fix get_light_freq on auto Sam Bobrowicz
2018-10-10  8:49   ` jacopo mondi
2018-10-09  6:48 ` [PATCH 3/4] media: ov5640: Don't access ctrl regs when off Sam Bobrowicz
2018-10-10  8:48   ` jacopo mondi
2018-10-09  6:48 ` [PATCH 4/4] media: ov5640: Add additional media bus formats Sam Bobrowicz
2018-11-16 13:18   ` Sakari Ailus

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=1539067682-60604-2-git-send-email-sam@elite-embedded.com \
    --to=sam@elite-embedded.com \
    --cc=linux-media@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).