diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
| commit | c3e004458c858a5cea7dc5a693c25b301c0a47a8 (patch) | |
| tree | b7aced58dd900d9afd01531ffefd1b00dffda92c /linux/drivers/media/video/videobuf-vmalloc.c | |
| parent | df971dfe066837946222937b94068df80d1270f2 (diff) | |
| parent | 73718ca8bbd9619f9d42780499c63b32fd074052 (diff) | |
| download | mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.gz mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.bz2 | |
merge backout patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/videobuf-vmalloc.c')
| -rw-r--r-- | linux/drivers/media/video/videobuf-vmalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/videobuf-vmalloc.c b/linux/drivers/media/video/videobuf-vmalloc.c index ceb4b54ac..84bb18565 100644 --- a/linux/drivers/media/video/videobuf-vmalloc.c +++ b/linux/drivers/media/video/videobuf-vmalloc.c @@ -52,7 +52,7 @@ videobuf_vm_open(struct vm_area_struct *vma) { struct videobuf_mapping *map = vma->vm_private_data; - dprintk(2,"vm_open %p [count=%d,vma=%08lx-%08lx]\n",map, + dprintk(2,"vm_open %p [count=%u,vma=%08lx-%08lx]\n",map, map->count,vma->vm_start,vma->vm_end); map->count++; @@ -65,7 +65,7 @@ videobuf_vm_close(struct vm_area_struct *vma) struct videobuf_queue *q = map->q; int i; - dprintk(2,"vm_close %p [count=%d,vma=%08lx-%08lx]\n",map, + dprintk(2,"vm_close %p [count=%u,vma=%08lx-%08lx]\n",map, map->count,vma->vm_start,vma->vm_end); map->count--; @@ -222,7 +222,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, } /* create mapping + update buffer list */ - map = q->bufs[first]->map = kmalloc(sizeof(struct videobuf_mapping),GFP_KERNEL); + map = q->bufs[first]->map = kzalloc(sizeof(struct videobuf_mapping),GFP_KERNEL); if (NULL == map) return -ENOMEM; |