[media] mx2_camera: Use soc_mbus_image_size() instead of manual computation
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 21 Mar 2012 11:03:27 +0000 (08:03 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 15 May 2012 19:11:23 +0000 (16:11 -0300)
Use the new soc_mbus_image_size() function to compute the image size.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/mx2_camera.c

index 368049d..b631687 100644 (file)
@@ -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);
                }
        }