Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 10:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB: videobuf: Add support for V4L2_BUF_FLAG_ERROR

Browse Source 
For recoverable stream errors dqbuf() now returns 0 and the error flag
is set instead of returning EIO.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2010-04-28 04:05:22 -03:00 committed by Mauro Carvalho Chehab
parent bc0f7f19ab
commit b2dfd1a45f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/videobuf-core.c
View File

@ -285,8 +285,10 @@ static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
case VIDEOBUF_ACTIVE: case VIDEOBUF_ACTIVE:
b->flags |= V4L2_BUF_FLAG_QUEUED; b->flags |= V4L2_BUF_FLAG_QUEUED;
break; break;
case VIDEOBUF_DONE:
case VIDEOBUF_ERROR: case VIDEOBUF_ERROR:
b->flags |= V4L2_BUF_FLAG_ERROR;
/* fall through */
case VIDEOBUF_DONE:
b->flags |= V4L2_BUF_FLAG_DONE; b->flags |= V4L2_BUF_FLAG_DONE;
break; break;
case VIDEOBUF_NEEDS_INIT: case VIDEOBUF_NEEDS_INIT:
@ -670,6 +672,7 @@ int videobuf_dqbuf(struct videobuf_queue *q,
MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS); MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
memset(b, 0, sizeof(*b));
mutex_lock(&q->vb_lock); mutex_lock(&q->vb_lock);
retval = stream_next_buffer(q, &buf, nonblocking); retval = stream_next_buffer(q, &buf, nonblocking);
@ -681,23 +684,20 @@ int videobuf_dqbuf(struct videobuf_queue *q,
switch (buf->state) { switch (buf->state) {
case VIDEOBUF_ERROR: case VIDEOBUF_ERROR:
dprintk(1, "dqbuf: state is error\n"); dprintk(1, "dqbuf: state is error\n");
retval = -EIO;
CALL(q, sync, q, buf);
buf->state = VIDEOBUF_IDLE;
break; break;
case VIDEOBUF_DONE: case VIDEOBUF_DONE:
dprintk(1, "dqbuf: state is done\n"); dprintk(1, "dqbuf: state is done\n");
CALL(q, sync, q, buf);
buf->state = VIDEOBUF_IDLE;
break; break;
default: default:
dprintk(1, "dqbuf: state invalid\n"); dprintk(1, "dqbuf: state invalid\n");
retval = -EINVAL; retval = -EINVAL;
goto done; goto done;
} }
list_del(&buf->stream); CALL(q, sync, q, buf);
memset(b, 0, sizeof(*b));
videobuf_status(q, b, buf, q->type); videobuf_status(q, b, buf, q->type);
list_del(&buf->stream);
buf->state = VIDEOBUF_IDLE;
b->flags &= ~V4L2_BUF_FLAG_DONE;
done: done:
mutex_unlock(&q->vb_lock); mutex_unlock(&q->vb_lock);
return retval; return retval;