From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun, 25 Apr 2010 14:23:52 +0000 (-0300)
Subject: V4L/DVB: videobuf-dma-sg: Avoid using a wrong size
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=474675ad8006834be996c046b47436d8ca7a5105;p=linux-beck.git

V4L/DVB: videobuf-dma-sg: Avoid using a wrong size

drivers/media/video/videobuf-dma-sg.c: In function ‘__videobuf_mmap_mapper’:
drivers/media/video/videobuf-dma-sg.c:557: warning: ‘size’ may be used uninitialized in this function

The condition where size is floating should never happen, due to the paranoia check,
but a future change at the logic might break it. So, let's just set size to zero and
use it for the paranoia check.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 1a7f3d3d2f99..f733833a021e 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/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;