---

yaml --- r: 343846 b: refs/heads/master c: ba40089 h: refs/heads/master v: v3
git-mirror · Oct 28, 2012 · 81bf889 · 81bf889
1 parent 05df023
commit 81bf889
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 830e4b55b02b8a2638958e4249eba71797940ee5
+refs/heads/master: ba4008921ba8144ff307f10d04fe52e6d6e744dc
diff --git a/trunk/drivers/media/i2c/soc_camera/ov2640.c b/trunk/drivers/media/i2c/soc_camera/ov2640.c
@@ -896,12 +896,10 @@ static int ov2640_s_fmt(struct v4l2_subdev *sd,
 static int ov2640_try_fmt(struct v4l2_subdev *sd,
 			  struct v4l2_mbus_framefmt *mf)
 {
-	const struct ov2640_win_size *win;
-
 	/*
-	 * select suitable win
+	 * select suitable win, but don't store it
 	 */
-	win = ov2640_select_win(&mf->width, &mf->height);
+	ov2640_select_win(&mf->width, &mf->height);
 
 	mf->field	= V4L2_FIELD_NONE;