From 565eb348b02915ac837345f3c6ab982cf8eac4cb Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 21 Mar 2012 08:03:27 -0300 Subject: [PATCH] --- yaml --- r: 306459 b: refs/heads/master c: b0a461ff1b476067c24131ea0b2a40571592f761 h: refs/heads/master i: 306457: 528519c1a4d7b66b0a63ba1d1ca5a5b3a40a39ce 306455: 4885803d9b2d99b568be0614322760caeaa2a7d4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx2_camera.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e55b117894e1..bda4202e02c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bed8d8033037431be3968cd604f32ad8b7260600 +refs/heads/master: b0a461ff1b476067c24131ea0b2a40571592f761 diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c index 368049dbe105..b63168781cfe 100644 --- a/trunk/drivers/media/video/mx2_camera.c +++ b/trunk/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); } }