From 5f33870fa326910cda6d557943acda17ca96e8a0 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Mon, 31 Jan 2011 09:58:01 -0300 Subject: [PATCH] --- yaml --- r: 241902 b: refs/heads/master c: 44facdc8c43a8b5172d6cbe995845c9889561aa0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx3_camera.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c3d59ce698d3..bea20900e135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bccd60852fc0a5ccc1980c10266896df99b8bda +refs/heads/master: 44facdc8c43a8b5172d6cbe995845c9889561aa0 diff --git a/trunk/drivers/media/video/mx3_camera.c b/trunk/drivers/media/video/mx3_camera.c index b9cb4a436959..1cfff4132a0b 100644 --- a/trunk/drivers/media/video/mx3_camera.c +++ b/trunk/drivers/media/video/mx3_camera.c @@ -918,6 +918,12 @@ static int mx3_camera_set_fmt(struct soc_camera_device *icd, pix->colorspace = mf.colorspace; icd->current_fmt = xlate; + pix->bytesperline = soc_mbus_bytes_per_line(pix->width, + xlate->host_fmt); + if (pix->bytesperline < 0) + return pix->bytesperline; + pix->sizeimage = pix->height * pix->bytesperline; + dev_dbg(icd->dev.parent, "Sensor set %dx%d\n", pix->width, pix->height); return ret;