aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-11-26 13:36:40 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-15 21:17:58 -0500
commitd50e257ee8d1a16ca91f9286120f222d34853c49 (patch)
tree8838f3bc346bf5f9dd4d347d4bdf13211cbd7f84 /drivers/media/video/gspca
parentfe2b6032513099b82cd19ef8da5050f02a18d3ec (diff)
V4L/DVB (13560): gspca - main: Cleanup source.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/gspca.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 9724e65d6485..92ed4d968cb0 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -304,7 +304,6 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
304 j = gspca_dev->fr_queue[i]; 304 j = gspca_dev->fr_queue[i];
305 gspca_dev->cur_frame = &gspca_dev->frame[j]; 305 gspca_dev->cur_frame = &gspca_dev->frame[j];
306 } 306 }
307 return;
308} 307}
309EXPORT_SYMBOL(gspca_frame_add); 308EXPORT_SYMBOL(gspca_frame_add);
310 309
@@ -321,7 +320,7 @@ static int gspca_is_compressed(__u32 format)
321 return 0; 320 return 0;
322} 321}
323 322
324static void *rvmalloc(unsigned long size) 323static void *rvmalloc(long size)
325{ 324{
326 void *mem; 325 void *mem;
327 unsigned long adr; 326 unsigned long adr;
@@ -329,7 +328,7 @@ static void *rvmalloc(unsigned long size)
329 mem = vmalloc_32(size); 328 mem = vmalloc_32(size);
330 if (mem != NULL) { 329 if (mem != NULL) {
331 adr = (unsigned long) mem; 330 adr = (unsigned long) mem;
332 while ((long) size > 0) { 331 while (size > 0) {
333 SetPageReserved(vmalloc_to_page((void *) adr)); 332 SetPageReserved(vmalloc_to_page((void *) adr));
334 adr += PAGE_SIZE; 333 adr += PAGE_SIZE;
335 size -= PAGE_SIZE; 334 size -= PAGE_SIZE;
@@ -1614,7 +1613,7 @@ static int dev_mmap(struct file *file, struct vm_area_struct *vma)
1614 size -= PAGE_SIZE; 1613 size -= PAGE_SIZE;
1615 } 1614 }
1616 1615
1617 vma->vm_ops = (struct vm_operations_struct *) &gspca_vm_ops; 1616 vma->vm_ops = &gspca_vm_ops;
1618 vma->vm_private_data = frame; 1617 vma->vm_private_data = frame;
1619 gspca_vm_open(vma); 1618 gspca_vm_open(vma);
1620 ret = 0; 1619 ret = 0;