diff options
author | Magnus Damm <damm@opensource.se> | 2009-12-11 09:53:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-16 06:27:41 -0500 |
commit | e6641c80b042461fb8d4a231a95fafdba167c28d (patch) | |
tree | 797643d4ab1235327fb6f7650f020b7b1ca631c9 /drivers/media/video | |
parent | 858424b998ae112b2e04f4584bcdc6b0362a714a (diff) |
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/video')
-rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 4 |
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, | |||
206 | if (bytes_per_line < 0) | 206 | if (bytes_per_line < 0) |
207 | return bytes_per_line; | 207 | return bytes_per_line; |
208 | 208 | ||
209 | *size = PAGE_ALIGN(bytes_per_line * icd->user_height); | 209 | *size = bytes_per_line * icd->user_height; |
210 | 210 | ||
211 | if (0 == *count) | 211 | if (0 == *count) |
212 | *count = 2; | 212 | *count = 2; |
213 | 213 | ||
214 | if (pcdev->video_limit) { | 214 | if (pcdev->video_limit) { |
215 | while (*size * *count > pcdev->video_limit) | 215 | while (PAGE_ALIGN(*size) * *count > pcdev->video_limit) |
216 | (*count)--; | 216 | (*count)--; |
217 | } | 217 | } |
218 | 218 | ||