|
@@ -28,7 +28,6 @@ struct videobuf_dma_contig_memory {
|
|
void *vaddr;
|
|
void *vaddr;
|
|
dma_addr_t dma_handle;
|
|
dma_addr_t dma_handle;
|
|
unsigned long size;
|
|
unsigned long size;
|
|
- int is_userptr;
|
|
|
|
};
|
|
};
|
|
|
|
|
|
#define MAGIC_DC_MEM 0x0733ac61
|
|
#define MAGIC_DC_MEM 0x0733ac61
|
|
@@ -120,7 +119,6 @@ static const struct vm_operations_struct videobuf_vm_ops = {
|
|
*/
|
|
*/
|
|
static void videobuf_dma_contig_user_put(struct videobuf_dma_contig_memory *mem)
|
|
static void videobuf_dma_contig_user_put(struct videobuf_dma_contig_memory *mem)
|
|
{
|
|
{
|
|
- mem->is_userptr = 0;
|
|
|
|
mem->dma_handle = 0;
|
|
mem->dma_handle = 0;
|
|
mem->size = 0;
|
|
mem->size = 0;
|
|
}
|
|
}
|
|
@@ -147,7 +145,6 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
|
|
|
|
|
|
offset = vb->baddr & ~PAGE_MASK;
|
|
offset = vb->baddr & ~PAGE_MASK;
|
|
mem->size = PAGE_ALIGN(vb->size + offset);
|
|
mem->size = PAGE_ALIGN(vb->size + offset);
|
|
- mem->is_userptr = 0;
|
|
|
|
ret = -EINVAL;
|
|
ret = -EINVAL;
|
|
|
|
|
|
down_read(&mm->mmap_sem);
|
|
down_read(&mm->mmap_sem);
|
|
@@ -181,9 +178,6 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
|
|
pages_done++;
|
|
pages_done++;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!ret)
|
|
|
|
- mem->is_userptr = 1;
|
|
|
|
-
|
|
|
|
out_up:
|
|
out_up:
|
|
up_read(¤t->mm->mmap_sem);
|
|
up_read(¤t->mm->mmap_sem);
|
|
|
|
|