summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2009-12-11 11:53:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 09:27:41 -0200
commite6641c80b042461fb8d4a231a95fafdba167c28d (patch)
tree797643d4ab1235327fb6f7650f020b7b1ca631c9 /drivers/media
parent858424b998ae112b2e04f4584bcdc6b0362a714a (diff)
downloadblackbird-op-linux-e6641c80b042461fb8d4a231a95fafdba167c28d.tar.gz
blackbird-op-linux-e6641c80b042461fb8d4a231a95fafdba167c28d.zip
V4L/DVB (13671): sh_mobile_ceu_camera: Remove frame size page alignment
This patch updates the SuperH Mobile CEU driver to not page align the frame size. Useful in the case of USERPTR with non-page aligned frame sizes and offsets. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/sh_mobile_ceu_camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index a610a571432a..d69363f0d8c9 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -206,13 +206,13 @@ static int sh_mobile_ceu_videobuf_setup(struct videobuf_queue *vq,
if (bytes_per_line < 0)
return bytes_per_line;
- *size = PAGE_ALIGN(bytes_per_line * icd->user_height);
+ *size = bytes_per_line * icd->user_height;
if (0 == *count)
*count = 2;
if (pcdev->video_limit) {
- while (*size * *count > pcdev->video_limit)
+ while (PAGE_ALIGN(*size) * *count > pcdev->video_limit)
(*count)--;
}
OpenPOWER on IntegriCloud