Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 65926
b: refs/heads/master
c: e78dcf5
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Oct 10, 2007
1 parent e4df04f commit be70f56
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c520a4970c7e5f18275ef935372e56eabd6d0e44
refs/heads/master: e78dcf55520769471c66024b13df7e9e592436f4
3 changes: 1 addition & 2 deletions trunk/drivers/media/video/videobuf-vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ static int __videobuf_iolock (struct videobuf_queue* q,

MAGIC_CHECK(mem->magic,MAGIC_VMAL_MEM);


pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;

/* Currently, doesn't support V4L2_MEMORY_OVERLAY */
Expand All @@ -153,7 +152,7 @@ static int __videobuf_iolock (struct videobuf_queue* q,
/* FIXME: should be tested with kernel mmap mem */
mem->vmalloc=vmalloc_user (PAGE_ALIGN(vb->size));
if (NULL == mem->vmalloc) {
dprintk(1,"vmalloc (%d pages) failed\n",pages);
printk(KERN_ERR "vmalloc (%d pages) failed\n",pages);
return -ENOMEM;
}

Expand Down

0 comments on commit be70f56

Please sign in to comment.