From d4490739f93da98b7223d72d55c267fbce29ceca Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Fri, 11 Dec 2009 11:53:56 -0300 Subject: [PATCH] --- yaml --- r: 176863 b: refs/heads/master c: e6641c80b042461fb8d4a231a95fafdba167c28d h: refs/heads/master i: 176861: 937f576028eb96ed9772e44d98f6cf99e312b86b 176859: 9cecb5f7f70ec7d69969670a63b9ab2013e201e3 176855: 2151c61378a1cf707152326e27ade720a901e572 176847: ad3dd4062279a28531c8719722c04a17c1705a39 176831: 24b7220c2f88cebc925b539b789c2a66339a305c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 578e5c2ecfa8..3a3311569fc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 858424b998ae112b2e04f4584bcdc6b0362a714a +refs/heads/master: e6641c80b042461fb8d4a231a95fafdba167c28d diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index a610a571432a..d69363f0d8c9 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/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)--; }