aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 11:46:42 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:18:48 -0300
commit0d205b6a09177cd14c109321fb40873418a11f7e (patch)
tree79dd69a481eb474ad9d4d8fce4ed8f6eef99e8d9 /drivers
parente330919a215714796efb451984a753a46b570eb7 (diff)
V4L/DVB (12518): ov772x: S_CROP must return actually configured geometry
V4L2 drivers are allowed to configure a geometry different than what has been requested by the user with S_CROP, but then they have to adjust the input rectangle accordingly. Fix ov772x to comply with this requirement. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/ov772x.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index c0c549fa786..b720558d8a2 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -960,12 +960,18 @@ static int ov772x_set_crop(struct soc_camera_device *icd,
{
struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
struct ov772x_priv *priv = to_ov772x(client);
+ int ret;
if (!priv->fmt)
return -EINVAL;
- return ov772x_set_params(client, &rect->width, &rect->height,
- priv->fmt->fourcc);
+ ret = ov772x_set_params(client, &rect->width, &rect->height,
+ priv->fmt->fourcc);
+ if (!ret) {
+ rect->left = 0;
+ rect->top = 0;
+ }
+ return ret;
}
static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)