aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dma-contig.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/videobuf-dma-contig.c')
-rw-r--r--drivers/media/video/videobuf-dma-contig.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
index 74730c624cfc..372b87efcd05 100644
--- a/drivers/media/video/videobuf-dma-contig.c
+++ b/drivers/media/video/videobuf-dma-contig.c
@@ -190,7 +190,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
190 return ret; 190 return ret;
191} 191}
192 192
193static struct videobuf_buffer *__videobuf_alloc(size_t size) 193static struct videobuf_buffer *__videobuf_alloc_vb(size_t size)
194{ 194{
195 struct videobuf_dma_contig_memory *mem; 195 struct videobuf_dma_contig_memory *mem;
196 struct videobuf_buffer *vb; 196 struct videobuf_buffer *vb;
@@ -280,8 +280,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
280 return -ENOMEM; 280 return -ENOMEM;
281 281
282 buf->map = map; 282 buf->map = map;
283 map->start = vma->vm_start;
284 map->end = vma->vm_end;
285 map->q = q; 283 map->q = q;
286 284
287 buf->baddr = vma->vm_start; 285 buf->baddr = vma->vm_start;
@@ -338,7 +336,7 @@ error:
338static struct videobuf_qtype_ops qops = { 336static struct videobuf_qtype_ops qops = {
339 .magic = MAGIC_QTYPE_OPS, 337 .magic = MAGIC_QTYPE_OPS,
340 338
341 .alloc = __videobuf_alloc, 339 .alloc_vb = __videobuf_alloc_vb,
342 .iolock = __videobuf_iolock, 340 .iolock = __videobuf_iolock,
343 .mmap_mapper = __videobuf_mmap_mapper, 341 .mmap_mapper = __videobuf_mmap_mapper,
344 .vaddr = __videobuf_to_vaddr, 342 .vaddr = __videobuf_to_vaddr,