summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2010-04-25 16:23:52 +0200
committerMauro Carvalho Chehab2010-05-19 17:57:58 +0200
commit474675ad8006834be996c046b47436d8ca7a5105 (patch)
tree556cfac9c0f4e5f345e847952802f5348cb1d3f0
parentV4L/DVB: gspca - main: Stop the webcam when bandwidth too small (diff)
downloadkernel-qcow2-linux-474675ad8006834be996c046b47436d8ca7a5105.tar.gz
kernel-qcow2-linux-474675ad8006834be996c046b47436d8ca7a5105.tar.xz
kernel-qcow2-linux-474675ad8006834be996c046b47436d8ca7a5105.zip
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>
-rw-r--r--drivers/media/video/videobuf-dma-sg.c4
1 files changed, 2 insertions, 2 deletions
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;