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

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/tw9910.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b059485e2019..7258bc90292c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2730756ad9649762583cb013f31f636f88bbec0
+refs/heads/master: 7bf6afbb6b528335290e73b74c7f9a8596ef5689
diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c
index 8768efb8508a..9f53eacb66e3 100644
--- a/trunk/drivers/media/video/tw9910.c
+++ b/trunk/drivers/media/video/tw9910.c
@@ -699,11 +699,9 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
 	struct tw9910_priv *priv = to_tw9910(client);
 
 	if (!priv->scale) {
-		int ret;
-		u32 width = 640, height = 480;
-		ret = tw9910_set_frame(sd, &width, &height);
-		if (ret < 0)
-			return ret;
+		priv->scale = tw9910_select_norm(priv->norm, 640, 480);
+		if (!priv->scale)
+			return -EINVAL;
 	}
 
 	mf->width	= priv->scale->width;