From: Laurent Pinchart Date: Wed, 21 Mar 2012 11:03:27 +0000 (-0300) Subject: [media] mx2_camera: Use soc_mbus_image_size() instead of manual computation X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0a461ff1b476067c24131ea0b2a40571592f761;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] mx2_camera: Use soc_mbus_image_size() instead of manual computation Use the new soc_mbus_image_size() function to compute the image size. Signed-off-by: Laurent Pinchart Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 368049dbe105..b63168781cfe 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1395,7 +1395,8 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, xlate->host_fmt); if (pix->bytesperline < 0) return pix->bytesperline; - pix->sizeimage = pix->height * pix->bytesperline; + pix->sizeimage = soc_mbus_image_size(xlate->host_fmt, + pix->bytesperline, pix->height); /* Check against the CSIRXCNT limit */ if (pix->sizeimage > 4 * 0x3ffff) { /* Adjust geometry, preserve aspect ratio */ @@ -1406,7 +1407,8 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, pix->bytesperline = soc_mbus_bytes_per_line(pix->width, xlate->host_fmt); BUG_ON(pix->bytesperline < 0); - pix->sizeimage = pix->height * pix->bytesperline; + pix->sizeimage = soc_mbus_image_size(xlate->host_fmt, + pix->bytesperline, pix->height); } }