From e18034c2da4a5f56d6d95f6fa1bfcf20e969b216 Mon Sep 17 00:00:00 2001 From: Katsuya Matsubara Date: Tue, 23 Apr 2013 07:51:37 -0300 Subject: [PATCH] --- yaml --- r: 377203 b: refs/heads/master c: 697a6d2387692c7f9c94f3bfb3dac474aa840f02 h: refs/heads/master i: 377201: a683e320e753f83691ef855f65a7393ac92c155e 377199: 5c5ac7ca4c6619ec97add8f9fb78a75f1380117b v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/sh_veu.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 02e249038418..e06f054621f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6abb3cf2c34554590791b7486e0e32b291feacc4 +refs/heads/master: 697a6d2387692c7f9c94f3bfb3dac474aa840f02 diff --git a/trunk/drivers/media/platform/sh_veu.c b/trunk/drivers/media/platform/sh_veu.c index ebf90bfab5ce..59a9deefb242 100644 --- a/trunk/drivers/media/platform/sh_veu.c +++ b/trunk/drivers/media/platform/sh_veu.c @@ -905,11 +905,11 @@ static int sh_veu_queue_setup(struct vb2_queue *vq, if (ftmp.fmt.pix.width != pix->width || ftmp.fmt.pix.height != pix->height) return -EINVAL; - size = pix->bytesperline ? pix->bytesperline * pix->height : - pix->width * pix->height * fmt->depth >> 3; + size = pix->bytesperline ? pix->bytesperline * pix->height * fmt->depth / fmt->ydepth : + pix->width * pix->height * fmt->depth / fmt->ydepth; } else { vfmt = sh_veu_get_vfmt(veu, vq->type); - size = vfmt->bytesperline * vfmt->frame.height; + size = vfmt->bytesperline * vfmt->frame.height * vfmt->fmt->depth / vfmt->fmt->ydepth; } if (count < 2)