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]); }