Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[karo-tx-linux.git] / drivers / media / v4l2-core / videobuf2-dma-contig.c

diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index ae35d255a43016cc325db28899a2351b83f4d02f..fd56f25632018fde92f1acefc4d284e6a47d6dba 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -162,9 +162,6 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
        if (!buf)
                return ERR_PTR(-ENOMEM);
 
-       /* align image size to PAGE_SIZE */
-       size = PAGE_ALIGN(size);
-
        buf->vaddr = dma_alloc_coherent(dev, size, &buf->dma_addr,
                                                GFP_KERNEL | gfp_flags);
        if (!buf->vaddr) {