V4L/DVB (12523): tw9910: return updated geometry on successful S_FMT and S_CROP
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 7199e0f..83596cb 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -699,6 +699,11 @@
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 @@
.width = pix->width,
.height = pix->height,
};
- int i;
+ int i, ret;
/*
* check color format
@@ -732,7 +737,12 @@
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)