From f289a8acb39514c70b3be66f108f5934849f6f3c Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Thu, 14 Jul 2011 18:10:44 -0300 Subject: [PATCH] --- yaml --- r: 271704 b: refs/heads/master c: 297875b6a1f3910c883e4b00bb9bc3e6c3aa6ab7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-dma-sg.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 62c6bc6c965a..1117f911f5f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77b1e2fbbdfa0ee5cdf6c928b711493a3738468e +refs/heads/master: 297875b6a1f3910c883e4b00bb9bc3e6c3aa6ab7 diff --git a/trunk/drivers/media/video/videobuf2-dma-sg.c b/trunk/drivers/media/video/videobuf2-dma-sg.c index 065f468faf8f..3bad8b105fea 100644 --- a/trunk/drivers/media/video/videobuf2-dma-sg.c +++ b/trunk/drivers/media/video/videobuf2-dma-sg.c @@ -75,12 +75,6 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size) printk(KERN_DEBUG "%s: Allocated buffer of %d pages\n", __func__, buf->sg_desc.num_pages); - - if (!buf->vaddr) - buf->vaddr = vm_map_ram(buf->pages, - buf->sg_desc.num_pages, - -1, - PAGE_KERNEL); return buf; fail_pages_alloc: