diff --git a/[refs] b/[refs]
index 20c1bd0e4895..0a4b576ca29e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 467142093de1507833a08c50740d74b3b8c8eaca
+refs/heads/master: a8e68c37c846236499ac05e95af76dff2e9aa1eb
diff --git a/trunk/drivers/media/video/ov7670.c b/trunk/drivers/media/video/ov7670.c
index 21243303755f..82d37d925eb4 100644
--- a/trunk/drivers/media/video/ov7670.c
+++ b/trunk/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;
 }