From 4473d32f99fa2896af50e31c6f56fcd50f457daa Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 7 Jun 2011 05:42:57 -0300 Subject: [PATCH] --- yaml --- r: 261383 b: refs/heads/master c: a5c1cee0e63da3ed7d8bdbf85f11e4895051d890 h: refs/heads/master i: 261381: fbf9a0678b6acc6b25d900a07d43fb3d56e00d48 261379: dbaf16c3cad34895baa1b30ff8ca776f2e466cc3 261375: bfd474e31106807292a86336e52c3a6e1457e881 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pxa_camera.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8a15aa0dfec2..2b7127e19852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6523208758a7a0dbb8947e248110992da53d4143 +refs/heads/master: a5c1cee0e63da3ed7d8bdbf85f11e4895051d890 diff --git a/trunk/drivers/media/video/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c index c5b27a4cda30..bc8600b443bc 100644 --- a/trunk/drivers/media/video/pxa_camera.c +++ b/trunk/drivers/media/video/pxa_camera.c @@ -1498,12 +1498,6 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd, &pix->height, 32, 2048, 0, pixfmt == V4L2_PIX_FMT_YUV422P ? 4 : 0); - 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;