Skip to content

Commit

Permalink
V4L/DVB (12523): tw9910: return updated geometry on successful S_FMT …
Browse files Browse the repository at this point in the history
…and S_CROP

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 904078f commit 123ab62
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/media/video/tw9910.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@ static int tw9910_set_crop(struct soc_camera_device *icd,
if (ret < 0)
goto tw9910_set_fmt_error;

rect->width = priv->scale->width;
rect->height = priv->scale->height;
rect->left = 0;
rect->top = 0;

return ret;

tw9910_set_fmt_error:
Expand All @@ -720,7 +725,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
.width = pix->width,
.height = pix->height,
};
int i;
int i, ret;

/*
* check color format
Expand All @@ -732,7 +737,12 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
if (i == ARRAY_SIZE(tw9910_color_fmt))
return -EINVAL;

return tw9910_set_crop(icd, &rect);
ret = tw9910_set_crop(icd, &rect);
if (!ret) {
pix->width = rect.width;
pix->height = rect.height;
}
return ret;
}

static int tw9910_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
Expand Down

0 comments on commit 123ab62

Please sign in to comment.