summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov7670.c
diff options
context:
space:
mode:
authorJonathan Corbet2010-03-18 23:10:18 +0100
committerMauro Carvalho Chehab2010-05-18 05:51:24 +0200
commita8e68c37c846236499ac05e95af76dff2e9aa1eb (patch)
treee33529034620e4dbcff84eab526bb04e1f787887 /drivers/media/video/ov7670.c
parentV4L/DVB: ov7670: Restore SMBUS I/O for the XO 1.0 (diff)
downloadkernel-qcow2-linux-a8e68c37c846236499ac05e95af76dff2e9aa1eb.tar.gz
kernel-qcow2-linux-a8e68c37c846236499ac05e95af76dff2e9aa1eb.tar.xz
kernel-qcow2-linux-a8e68c37c846236499ac05e95af76dff2e9aa1eb.zip
V4L/DVB: ov7670: Always rewrite clkrc when setting format
That makes frame rate configuration persistent. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r--drivers/media/video/ov7670.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 21243303755f..82d37d925eb4 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -838,8 +838,12 @@ static int ov7670_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
* the other parameters or the image looks poor. If we're *not*
* doing RGB565, we must not rewrite clkrc or the image looks
* *really* poor.
+ *
+ * (Update) Now that we retain clkrc state, we should be able
+ * to write it unconditionally, and that will make the frame
+ * rate persistent too.
*/
- if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_RGB565 && ret == 0)
+ if (ret == 0)
ret = ov7670_write(sd, REG_CLKRC, info->clkrc);
return ret;
}