Skip to content

Commit

Permalink
V4L/DVB (12518): ov772x: S_CROP must return actually configured geometry
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent e330919 commit 0d205b6
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/media/video/ov772x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0d205b6

Please sign in to comment.