From 65068f054ef6f379ae6ab567d30015f14396fd77 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 7 Jun 2011 05:44:19 -0300
Subject: [PATCH] --- yaml --- r: 261384 b: refs/heads/master c:
 91401219c073a565af79223215a84250bbc8c79e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b7127e19852..f0865e1412cd 100644
--- 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
index bc8600b443bc..c42aac132ebf 100644
--- 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;