From 3d807d16fe4e3d85d8bb2f9e6699768a8f863234 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 18 Jul 2012 10:53:58 -0300
Subject: [PATCH] --- yaml --- r: 320625 b: refs/heads/master c:
 f98598391246068359604718cd925020d62bb40e h: refs/heads/master i:   320623:
 66c4458d75be0f1cde9de0f8b18f61aa29718d3b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/ov2640.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 32a1b708cb6d..bcc8aa3a8d48 100644
--- 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
index 3c2c5d3bcc6b..7c44d1fe3c87 100644
--- 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;