git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media: cpia2: Fix a couple off by one bugs
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cpia2
/
cpia2_v4l.c
diff --git
a/drivers/media/video/cpia2/cpia2_v4l.c
b/drivers/media/video/cpia2/cpia2_v4l.c
index
077eb1d
..
4c6777f
100644
(file)
--- a/
drivers/media/video/cpia2/cpia2_v4l.c
+++ b/
drivers/media/video/cpia2/cpia2_v4l.c
@@
-1152,7
+1152,7
@@
static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
struct camera_data *cam = video_drvdata(file);
if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
struct camera_data *cam = video_drvdata(file);
if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
- buf->index > cam->num_frames)
+ buf->index >
=
cam->num_frames)
return -EINVAL;
buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;
return -EINVAL;
buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;
@@
-1201,7
+1201,7
@@
static int cpia2_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
buf->memory != V4L2_MEMORY_MMAP ||
if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
buf->memory != V4L2_MEMORY_MMAP ||
- buf->index > cam->num_frames)
+ buf->index >
=
cam->num_frames)
return -EINVAL;
DBG("QBUF #%d\n", buf->index);
return -EINVAL;
DBG("QBUF #%d\n", buf->index);