summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 11:46:53 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:19:02 -0300
commit4a5a5b2d620c3ec362936c4fe3799a29f8de163c (patch)
tree06ed606ad5303c3b350800c2e16d63d1d27775f2
parent94896298bea7823cbccbff563c77b4ae6cabb08e (diff)
downloadop-kernel-dev-4a5a5b2d620c3ec362936c4fe3799a29f8de163c.zip
op-kernel-dev-4a5a5b2d620c3ec362936c4fe3799a29f8de163c.tar.gz
V4L/DVB (12527): tw9910: do not lie about cropping abilities
The current tw9910 driver does not implement cropping correctly. Therefore, and also because various rectangles in struct soc_camera_device are in user scale, we cannot and shall not use rect_current as window location. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/tw9910.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 83596cb..735d0bd 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -719,9 +719,10 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
struct i2c_client *client = sd->priv;
struct soc_camera_device *icd = client->dev.platform_data;
struct v4l2_pix_format *pix = &f->fmt.pix;
+ /* See tw9910_set_crop() - no proper cropping support */
struct v4l2_rect rect = {
- .left = icd->rect_current.left,
- .top = icd->rect_current.top,
+ .left = 0,
+ .top = 0,
.width = pix->width,
.height = pix->height,
};
@@ -850,6 +851,7 @@ static struct v4l2_subdev_ops tw9910_subdev_ops = {
* i2c_driver function
*/
+/* This is called during probe, so, setting rect_max is Ok here: scale == 1 */
static void limit_to_scale(struct soc_camera_device *icd,
const struct tw9910_scale_ctrl *scale)
{
OpenPOWER on IntegriCloud