From d1cf5e11226111ce70c508328ca28e009a750de2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 25 Apr 2010 11:23:52 -0300
Subject: [PATCH] --- yaml --- r: 193031 b: refs/heads/master c:
 474675ad8006834be996c046b47436d8ca7a5105 h: refs/heads/master i:   193029:
 6da35b48675f48f19d8f326789e3c904a647e00f   193027:
 574f111e989d0930d2ba6a0238b820f5f1541236   193023:
 d0e3a0d93bd3e461e49bd81d5986a0ddac238725 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/videobuf-dma-sg.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a77a75be3137..23163ad31b2f 100644
--- 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
index 1a7f3d3d2f99..f733833a021e 100644
--- 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;