aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/videobuf-dma-sg.c4
-rw-r--r--include/media/videobuf-dma-sg.h3
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 440c1a8e9c1f..c0b7902862e4 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -162,9 +162,6 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
162 dprintk(1,"init user [0x%lx+0x%lx => %d pages]\n", 162 dprintk(1,"init user [0x%lx+0x%lx => %d pages]\n",
163 data,size,dma->nr_pages); 163 data,size,dma->nr_pages);
164 164
165 dma->varea = (void *) data;
166
167
168 err = get_user_pages(current,current->mm, 165 err = get_user_pages(current,current->mm,
169 data & PAGE_MASK, dma->nr_pages, 166 data & PAGE_MASK, dma->nr_pages,
170 rw == READ, 1, /* force */ 167 rw == READ, 1, /* force */
@@ -300,7 +297,6 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
300 297
301 vfree(dma->vmalloc); 298 vfree(dma->vmalloc);
302 dma->vmalloc = NULL; 299 dma->vmalloc = NULL;
303 dma->varea = NULL;
304 300
305 if (dma->bus_addr) { 301 if (dma->bus_addr) {
306 dma->bus_addr = 0; 302 dma->bus_addr = 0;
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index b6ab08045de6..be8da269ee33 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -68,9 +68,6 @@ struct videobuf_dmabuf {
68 /* for kernel buffers */ 68 /* for kernel buffers */
69 void *vmalloc; 69 void *vmalloc;
70 70
71 /* Stores the userspace pointer to vmalloc area */
72 void *varea;
73
74 /* for overlay buffers (pci-pci dma) */ 71 /* for overlay buffers (pci-pci dma) */
75 dma_addr_t bus_addr; 72 dma_addr_t bus_addr;
76 73