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
V4L/DVB (11742): TI THS7303 video amplifier driver code
[pandora-kernel.git]
/
drivers
/
media
/
video
/
videobuf-core.c
diff --git
a/drivers/media/video/videobuf-core.c
b/drivers/media/video/videobuf-core.c
index
0a88c44
..
48c3ebd
100644
(file)
--- a/
drivers/media/video/videobuf-core.c
+++ b/
drivers/media/video/videobuf-core.c
@@
-16,6
+16,7
@@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
@@
-438,6
+439,7
@@
int videobuf_reqbufs(struct videobuf_queue *q,
}
req->count = retval;
}
req->count = retval;
+ retval = 0;
done:
mutex_unlock(&q->vb_lock);
done:
mutex_unlock(&q->vb_lock);
@@
-453,7
+455,7
@@
int videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
dprintk(1, "querybuf: Wrong type.\n");
goto done;
}
dprintk(1, "querybuf: Wrong type.\n");
goto done;
}
- if (unlikely(b->index
< 0 || b->index
>= VIDEO_MAX_FRAME)) {
+ if (unlikely(b->index >= VIDEO_MAX_FRAME)) {
dprintk(1, "querybuf: index out of range.\n");
goto done;
}
dprintk(1, "querybuf: index out of range.\n");
goto done;
}
@@
-494,7
+496,7
@@
int videobuf_qbuf(struct videobuf_queue *q,
dprintk(1, "qbuf: Wrong type.\n");
goto done;
}
dprintk(1, "qbuf: Wrong type.\n");
goto done;
}
- if (b->index
< 0 || b->index
>= VIDEO_MAX_FRAME) {
+ if (b->index >= VIDEO_MAX_FRAME) {
dprintk(1, "qbuf: index out of range.\n");
goto done;
}
dprintk(1, "qbuf: index out of range.\n");
goto done;
}