---

yaml --- r: 176863 b: refs/heads/master c: e6641c8 h: refs/heads/master i: 176861: 937f576 176859: 9cecb5f 176855: 2151c61 176847: ad3dd40 176831: 24b7220 v: v3
git-mirror · Dec 16, 2009 · d449073 · d449073
1 parent 048a27e
commit d449073
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)--;
 	}