From 755cf19bd8ae8ae40132c211599a9c3120944fef Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Sat, 4 Jun 2011 14:11:10 -0300 Subject: [PATCH] --- yaml --- r: 261382 b: refs/heads/master c: 6523208758a7a0dbb8947e248110992da53d4143 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx3_camera.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index b38f3b5d2de3..8a15aa0dfec2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82a7c049449ec5a2194249da341ec8bde14e968b +refs/heads/master: 6523208758a7a0dbb8947e248110992da53d4143 diff --git a/trunk/drivers/media/video/mx3_camera.c b/trunk/drivers/media/video/mx3_camera.c index 36f0ed9ca9e1..cdb7dad05c1e 100644 --- a/trunk/drivers/media/video/mx3_camera.c +++ b/trunk/drivers/media/video/mx3_camera.c @@ -912,12 +912,6 @@ 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; @@ -945,12 +939,6 @@ static int mx3_camera_try_fmt(struct soc_camera_device *icd, if (pix->width > 4096) pix->width = 4096; - 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; - /* limit to sensor capabilities */ mf.width = pix->width; mf.height = pix->height;