diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:52 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:52 +0200 |
| commit | 0b4b46ce45c942a26e9a5b68cd826cbbcfb39d8f (patch) | |
| tree | 4cd1adbebcc02a1e26541cf632ef2206cb326f17 | |
| parent | 83741e5418caf367ba88caf33d4475755826ff4f (diff) | |
| download | mediapointer-dvb-s2-0b4b46ce45c942a26e9a5b68cd826cbbcfb39d8f.tar.gz mediapointer-dvb-s2-0b4b46ce45c942a26e9a5b68cd826cbbcfb39d8f.tar.bz2 | |
tw9910: return updated geometry on successful S_FMT and S_CROP
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/tw9910.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
| -rw-r--r-- | linux/drivers/media/video/tw9910.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tw9910.c b/linux/drivers/media/video/tw9910.c index f1a146807..29bafb3f3 100644 --- a/linux/drivers/media/video/tw9910.c +++ b/linux/drivers/media/video/tw9910.c @@ -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: @@ -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 @@ -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) |