From 671ccb9d1c58050083437fc991dbfdd28421a92c Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 21 Oct 2011 04:56:12 -0300 Subject: [PATCH] --- yaml --- r: 306479 b: refs/heads/master c: c1bf9c654a752b68be1b4408b33443a17515a671 h: refs/heads/master i: 306477: 53de9c615657a99910708f8e5ef85fbf944d1c1b 306475: 1f5d2c68131166195519da67fa8368c2099d7fb8 306471: 871c292bbf1cacd53b287b887278acbc9b1cf0a4 306463: b78396024bb48e7fbd1bd08d9bc2a0a089a94ba1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-tv/mixer_video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08c4bbef6443..6f8eae53e880 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d5934446aded013d55fcbf191d754667fa9d261 +refs/heads/master: c1bf9c654a752b68be1b4408b33443a17515a671 diff --git a/trunk/drivers/media/video/s5p-tv/mixer_video.c b/trunk/drivers/media/video/s5p-tv/mixer_video.c index c0eadd75c9ac..cc1e9b9b53ba 100644 --- a/trunk/drivers/media/video/s5p-tv/mixer_video.c +++ b/trunk/drivers/media/video/s5p-tv/mixer_video.c @@ -853,7 +853,7 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt, *nplanes = fmt->num_subframes; for (i = 0; i < fmt->num_subframes; ++i) { alloc_ctxs[i] = layer->mdev->alloc_ctx; - sizes[i] = PAGE_ALIGN(planes[i].sizeimage); + sizes[i] = planes[i].sizeimage; mxr_dbg(mdev, "size[%d] = %08lx\n", i, sizes[i]); }