---

yaml --- r: 164229 b: refs/heads/master c: 9489629 h: refs/heads/master i: 164227: 39a6d36 v: v3
git-mirror · Sep 19, 2009 · ed7b8d2 · ed7b8d2
1 parent a9d5b88
commit ed7b8d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b897a91afbed57558324ef4059efa2e2419e8b66
+refs/heads/master: 94896298bea7823cbccbff563c77b4ae6cabb08e
diff --git a/trunk/drivers/media/video/ov772x.c b/trunk/drivers/media/video/ov772x.c
@@ -955,23 +955,22 @@ static int ov772x_set_params(struct i2c_client *client,
 	return ret;
 }
 
+/* Cannot crop, just return the current geometry */
 static int ov772x_set_crop(struct soc_camera_device *icd,
 			   struct v4l2_rect *rect)
 {
 	struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
 	struct ov772x_priv *priv = to_ov772x(client);
-	int ret;
 
-	if (!priv->fmt)
+	if (!priv->fmt || !priv->win)
 		return -EINVAL;
 
-	ret = ov772x_set_params(client, &rect->width, &rect->height,
-				priv->fmt->fourcc);
-	if (!ret) {
-		rect->left = 0;
-		rect->top = 0;
-	}
-	return ret;
+	rect->left = 0;
+	rect->top = 0;
+	rect->width = priv->win->width;
+	rect->height = priv->win->height;
+
+	return 0;
 }
 
 static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)