diff options
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index 8359e6badd36..a9b109178578 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -428,7 +428,7 @@ static const struct vm_operations_struct videobuf_vm_ops = { | |||
428 | struct videobuf_dma_sg_memory | 428 | struct videobuf_dma_sg_memory |
429 | */ | 429 | */ |
430 | 430 | ||
431 | static struct videobuf_buffer *__videobuf_alloc(size_t size) | 431 | static struct videobuf_buffer *__videobuf_alloc_vb(size_t size) |
432 | { | 432 | { |
433 | struct videobuf_dma_sg_memory *mem; | 433 | struct videobuf_dma_sg_memory *mem; |
434 | struct videobuf_buffer *vb; | 434 | struct videobuf_buffer *vb; |
@@ -638,7 +638,7 @@ done: | |||
638 | static struct videobuf_qtype_ops sg_ops = { | 638 | static struct videobuf_qtype_ops sg_ops = { |
639 | .magic = MAGIC_QTYPE_OPS, | 639 | .magic = MAGIC_QTYPE_OPS, |
640 | 640 | ||
641 | .alloc = __videobuf_alloc, | 641 | .alloc_vb = __videobuf_alloc_vb, |
642 | .iolock = __videobuf_iolock, | 642 | .iolock = __videobuf_iolock, |
643 | .sync = __videobuf_sync, | 643 | .sync = __videobuf_sync, |
644 | .mmap_mapper = __videobuf_mmap_mapper, | 644 | .mmap_mapper = __videobuf_mmap_mapper, |
@@ -654,7 +654,7 @@ void *videobuf_sg_alloc(size_t size) | |||
654 | 654 | ||
655 | q.msize = size; | 655 | q.msize = size; |
656 | 656 | ||
657 | return videobuf_alloc(&q); | 657 | return videobuf_alloc_vb(&q); |
658 | } | 658 | } |
659 | EXPORT_SYMBOL_GPL(videobuf_sg_alloc); | 659 | EXPORT_SYMBOL_GPL(videobuf_sg_alloc); |
660 | 660 | ||