Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[cascardo/linux.git] / drivers / media / video / videobuf-vmalloc.c

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index e012594..5266ecc 100644 (file)
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -41,7 +41,7 @@ MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@infradead.org>");
 MODULE_LICENSE("GPL");
 
 #define dprintk(level, fmt, arg...)    if (debug >= level) \
-       printk(KERN_DEBUG "vbuf-sg: " fmt , ## arg)
+       printk(KERN_DEBUG "vbuf-vmalloc: " fmt , ## arg)
 
 
 /***************************************************************************/
@@ -70,7 +70,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
        map->count--;
        if (0 == map->count) {
                dprintk(1,"munmap %p q=%p\n",map,q);
-               mutex_lock(&q->lock);
+               mutex_lock(&q->vb_lock);
                for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                        if (NULL == q->bufs[i])
                                continue;
@@ -83,7 +83,7 @@ videobuf_vm_close(struct vm_area_struct *vma)
                        q->bufs[i]->map   = NULL;
                        q->bufs[i]->baddr = 0;
                }
-               mutex_unlock(&q->lock);
+               mutex_unlock(&q->vb_lock);
                kfree(map);
        }
        return;
@@ -107,7 +107,7 @@ static struct vm_operations_struct videobuf_vm_ops =
 
 static void *__videobuf_alloc(size_t size)
 {
-       struct videbuf_vmalloc_memory *mem;
+       struct videobuf_vmalloc_memory *mem;
        struct videobuf_buffer *vb;
 
        vb = kzalloc(size+sizeof(*mem),GFP_KERNEL);
@@ -127,9 +127,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                              struct v4l2_framebuffer *fbuf)
 {
        int pages;
-
-       struct videbuf_vmalloc_memory *mem=vb->priv;
-
+       struct videobuf_vmalloc_memory *mem=vb->priv;
 
        BUG_ON(!mem);
 
@@ -195,7 +193,7 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
 static int __videobuf_mmap_mapper(struct videobuf_queue *q,
                         struct vm_area_struct *vma)
 {
-       struct videbuf_vmalloc_memory *mem;
+       struct videobuf_vmalloc_memory *mem;
        struct videobuf_mapping *map;
        unsigned int first;
        int retval;
@@ -267,7 +265,7 @@ static int __videobuf_copy_to_user ( struct videobuf_queue *q,
                                char __user *data, size_t count,
                                int nonblocking )
 {
-       struct videbuf_vmalloc_memory *mem=q->read_buf->priv;
+       struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
        BUG_ON (!mem);
        MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -288,7 +286,7 @@ static int __videobuf_copy_stream ( struct videobuf_queue *q,
                                int vbihack, int nonblocking )
 {
        unsigned int  *fc;
-       struct videbuf_vmalloc_memory *mem=q->read_buf->priv;
+       struct videobuf_vmalloc_memory *mem=q->read_buf->priv;
        BUG_ON (!mem);
        MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -341,7 +339,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_vmalloc_init);
 
 void *videobuf_to_vmalloc (struct videobuf_buffer *buf)
 {
-       struct videbuf_vmalloc_memory *mem=buf->priv;
+       struct videobuf_vmalloc_memory *mem=buf->priv;
        BUG_ON (!mem);
        MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);
 
@@ -351,7 +349,7 @@ EXPORT_SYMBOL_GPL(videobuf_to_vmalloc);
 
 void videobuf_vmalloc_free (struct videobuf_buffer *buf)
 {
-       struct videbuf_vmalloc_memory *mem=buf->priv;
+       struct videobuf_vmalloc_memory *mem=buf->priv;
        BUG_ON (!mem);
 
        MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);