summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/sh_mobile_ceu_camera.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-10-05 12:51:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-11-07 12:55:06 -0200
commit8cf1fec877c102beeae1e13624b1f7d20abbf8f9 (patch)
tree9d48bff8b79c8eb80f8b268465e9438c56f48d96 /drivers/media/video/sh_mobile_ceu_camera.c
parent1381dfd5150cfbdb5fa55ce7ab5ab56812111909 (diff)
downloadlinux-stable-8cf1fec877c102beeae1e13624b1f7d20abbf8f9.tar.gz
linux-stable-8cf1fec877c102beeae1e13624b1f7d20abbf8f9.tar.bz2
linux-stable-8cf1fec877c102beeae1e13624b1f7d20abbf8f9.zip
V4L/DVB (13129): sh_mobile_ceu_camera: fix cropping for scaling clients
Fix a bug in cropping calculation, when the client is also scaling the image. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/sh_mobile_ceu_camera.c')
-rw-r--r--drivers/media/video/sh_mobile_ceu_camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 65ac474c517a..2f78b4f263f5 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -1173,8 +1173,8 @@ static int get_scales(struct soc_camera_device *icd,
width_in = scale_up(cam->ceu_rect.width, *scale_h);
height_in = scale_up(cam->ceu_rect.height, *scale_v);
- *scale_h = calc_generic_scale(cam->ceu_rect.width, icd->user_width);
- *scale_v = calc_generic_scale(cam->ceu_rect.height, icd->user_height);
+ *scale_h = calc_generic_scale(width_in, icd->user_width);
+ *scale_v = calc_generic_scale(height_in, icd->user_height);
return 0;
}