Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (12523): tw9910: return updated geometry on successful S_FMT and S_CROP

Browse source 
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2009-08-25 11:46:52 -03:00 committed by Mauro Carvalho Chehab
parent 904078f16f
commit 123ab622c0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/video/tw9910.c
View file

@ -699,6 +699,11 @@ static int tw9910_set_crop(struct soc_camera_device *icd,
if (ret < 0) if (ret < 0)
goto tw9910_set_fmt_error; goto tw9910_set_fmt_error;
rect->width = priv->scale->width;
rect->height = priv->scale->height;
rect->left = 0;
rect->top = 0;
return ret; return ret;
tw9910_set_fmt_error: tw9910_set_fmt_error:
@ -720,7 +725,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
.width = pix->width, .width = pix->width,
.height = pix->height, .height = pix->height,
}; };
int i; int i, ret;
/* /*
* check color format * 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)) if (i == ARRAY_SIZE(tw9910_color_fmt))
return -EINVAL; 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) static int tw9910_try_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)