From 1f5842818e9b130d139fe3fc25997a92f8a1d7e0 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 25 Aug 2009 11:46:53 -0300
Subject: [PATCH] --- yaml --- r: 164230 b: refs/heads/master c:
 4a5a5b2d620c3ec362936c4fe3799a29f8de163c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e8ad957d627e..75e886941a0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94896298bea7823cbccbff563c77b4ae6cabb08e
+refs/heads/master: 4a5a5b2d620c3ec362936c4fe3799a29f8de163c
diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c
index 83596cbc9b98..735d0bd4bb10 100644
--- a/trunk/drivers/media/video/tw9910.c
+++ b/trunk/drivers/media/video/tw9910.c
@@ -719,9 +719,10 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
 	struct i2c_client *client = sd->priv;
 	struct soc_camera_device *icd = client->dev.platform_data;
 	struct v4l2_pix_format *pix = &f->fmt.pix;
+	/* See tw9910_set_crop() - no proper cropping support */
 	struct v4l2_rect rect = {
-		.left	= icd->rect_current.left,
-		.top	= icd->rect_current.top,
+		.left	= 0,
+		.top	= 0,
 		.width	= pix->width,
 		.height	= pix->height,
 	};
@@ -850,6 +851,7 @@ static struct v4l2_subdev_ops tw9910_subdev_ops = {
  * i2c_driver function
  */
 
+/* This is called during probe, so, setting rect_max is Ok here: scale == 1 */
 static void limit_to_scale(struct soc_camera_device *icd,
 			   const struct tw9910_scale_ctrl *scale)
 {