---

yaml --- r: 320627 b: refs/heads/master c: 7bf6afb h: refs/heads/master i: 320625: 3d807d1 320623: 66c4458 v: v3
git-mirror · Jul 30, 2012 · ccc6860 · ccc6860
1 parent e6ed91c
commit ccc6860
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;