diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-25 11:23:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:58 -0300 |
| commit | 474675ad8006834be996c046b47436d8ca7a5105 (patch) | |
| tree | 556cfac9c0f4e5f345e847952802f5348cb1d3f0 /drivers/media/video/videobuf-dma-sg.c | |
| parent | e4dac289f01da80d7966a123bc1ea97be199ba4f (diff) | |
| download | lwn-474675ad8006834be996c046b47436d8ca7a5105.tar.gz lwn-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>
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
| -rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 4 |
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; |