---

yaml --- r: 320625 b: refs/heads/master c: f985983 h: refs/heads/master i: 320623: 66c4458 v: v3
git-mirror · Jul 30, 2012 · 3d807d1 · 3d807d1
1 parent bc6172b
commit 3d807d1
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: 2744782ef15151469ddd1e28c14e4b2c950be6dd
+refs/heads/master: f98598391246068359604718cd925020d62bb40e
diff --git a/trunk/drivers/media/video/ov2640.c b/trunk/drivers/media/video/ov2640.c
@@ -837,10 +837,8 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
 
 	if (!priv->win) {
 		u32 width = W_SVGA, height = H_SVGA;
-		int ret = ov2640_set_params(client, &width, &height,
-					    V4L2_MBUS_FMT_UYVY8_2X8);
-		if (ret < 0)
-			return ret;
+		priv->win = ov2640_select_win(&width, &height);
+		priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8;
 	}
 
 	mf->width	= priv->win->width;