From: Guennadi Liakhovetski Date: Mon, 5 Oct 2009 15:51:47 +0000 (-0300) Subject: V4L/DVB (13129): sh_mobile_ceu_camera: fix cropping for scaling clients X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8cf1fec877c102beeae1e13624b1f7d20abbf8f9;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 65ac474c517..2f78b4f263f 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; }