---

yaml --- r: 193031 b: refs/heads/master c: 474675a h: refs/heads/master i: 193029: 6da35b4 193027: 574f111 193023: d0e3a0d v: v3
git-mirror · May 19, 2010 · d1cf5e1 · d1cf5e1
1 parent bbfc8c0
commit d1cf5e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4dac289f01da80d7966a123bc1ea97be199ba4f
+refs/heads/master: 474675ad8006834be996c046b47436d8ca7a5105
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
@@ -554,7 +554,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
 {
 	struct videobuf_dma_sg_memory *mem = buf->priv;
 	struct videobuf_mapping *map;
-	unsigned int first, last, size, i;
+	unsigned int first, last, size = 0, i;
 	int retval;
 
 	retval = -EINVAL;
@@ -579,7 +579,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
 	}
 
 	/* paranoia, should never happen since buf is always valid. */
-	if (VIDEO_MAX_FRAME == first) {
+	if (!size) {
 		dprintk(1, "mmap app bug: offset invalid [offset=0x%lx]\n",
 				(vma->vm_pgoff << PAGE_SHIFT));
 		goto done;