projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
videobuf-core.c
diff --git
a/drivers/media/video/videobuf-core.c
b/drivers/media/video/videobuf-core.c
index ffdf59cfe4054f18d258ec4d682fddcfc7dc1aa7..bf7a326b1cdc06f8346981f246a74be572894fe4 100644
(file)
--- a/
drivers/media/video/videobuf-core.c
+++ b/
drivers/media/video/videobuf-core.c
@@
-359,11
+359,6
@@
static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
break;
}
break;
}
- if (vb->input != UNSET) {
- b->flags |= V4L2_BUF_FLAG_INPUT;
- b->input = vb->input;
- }
-
b->field = vb->field;
b->timestamp = vb->ts;
b->bytesused = vb->size;
b->field = vb->field;
b->timestamp = vb->ts;
b->bytesused = vb->size;
@@
-402,7
+397,6
@@
int __videobuf_mmap_setup(struct videobuf_queue *q,
break;
q->bufs[i]->i = i;
break;
q->bufs[i]->i = i;
- q->bufs[i]->input = UNSET;
q->bufs[i]->memory = memory;
q->bufs[i]->bsize = bsize;
switch (memory) {
q->bufs[i]->memory = memory;
q->bufs[i]->bsize = bsize;
switch (memory) {
@@
-566,16
+560,6
@@
int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b)
goto done;
}
goto done;
}
- if (b->flags & V4L2_BUF_FLAG_INPUT) {
- if (b->input >= q->inputs) {
- dprintk(1, "qbuf: wrong input.\n");
- goto done;
- }
- buf->input = b->input;
- } else {
- buf->input = UNSET;
- }
-
switch (b->memory) {
case V4L2_MEMORY_MMAP:
if (0 == buf->baddr) {
switch (b->memory) {
case V4L2_MEMORY_MMAP:
if (0 == buf->baddr) {