Skip to content

Commit

Permalink
V4L/DVB (12516): ov772x: successful S_FMT and S_CROP must update user…
Browse files Browse the repository at this point in the history
…-provided rectangle

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 a0705b0 commit bf62e1d
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/media/video/ov772x.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
}

static int ov772x_set_params(struct i2c_client *client,
u32 width, u32 height, u32 pixfmt)
u32 *width, u32 *height, u32 pixfmt)
{
struct ov772x_priv *priv = to_ov772x(client);
int ret = -EINVAL;
Expand All @@ -829,7 +829,7 @@ static int ov772x_set_params(struct i2c_client *client,
/*
* select win
*/
priv->win = ov772x_select_win(width, height);
priv->win = ov772x_select_win(*width, *height);

/*
* reset hardware
Expand Down Expand Up @@ -941,6 +941,9 @@ static int ov772x_set_params(struct i2c_client *client,
goto ov772x_set_fmt_error;
}

*width = priv->win->width;
*height = priv->win->height;

return ret;

ov772x_set_fmt_error:
Expand All @@ -961,7 +964,7 @@ static int ov772x_set_crop(struct soc_camera_device *icd,
if (!priv->fmt)
return -EINVAL;

return ov772x_set_params(client, rect->width, rect->height,
return ov772x_set_params(client, &rect->width, &rect->height,
priv->fmt->fourcc);
}

Expand All @@ -970,7 +973,7 @@ static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
struct i2c_client *client = sd->priv;
struct v4l2_pix_format *pix = &f->fmt.pix;

return ov772x_set_params(client, pix->width, pix->height,
return ov772x_set_params(client, &pix->width, &pix->height,
pix->pixelformat);
}

Expand Down

0 comments on commit bf62e1d

Please sign in to comment.