---

yaml --- r: 261384 b: refs/heads/master c: 9140121 h: refs/heads/master v: v3
git-mirror · Jul 27, 2011 · 65068f0 · 65068f0
1 parent 4473d32
commit 65068f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5c1cee0e63da3ed7d8bdbf85f11e4895051d890
+refs/heads/master: 91401219c073a565af79223215a84250bbc8c79e
diff --git a/trunk/drivers/media/video/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c
@@ -1501,7 +1501,8 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
 	/* limit to sensor capabilities */
 	mf.width	= pix->width;
 	mf.height	= pix->height;
-	mf.field	= pix->field;
+	/* Only progressive video supported so far */
+	mf.field	= V4L2_FIELD_NONE;
 	mf.colorspace	= pix->colorspace;
 	mf.code		= xlate->code;