openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] vb2: Handle return value from start_streaming callback 

Fix vb2 not handling return value from start_streaming() callback.

Signed-off-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Pawel Osciak 2011-03-20 19:26:41 -03:00 committed by Mauro Carvalho Chehab
parent 4ffabdb35a
commit 5db2c3ba4d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/video/videobuf2-core.c
View File

@ -1111,6 +1111,7 @@ EXPORT_SYMBOL_GPL(vb2_dqbuf);
int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type) int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type)
{ {
struct vb2_buffer *vb; struct vb2_buffer *vb;
int ret;
if (q->fileio) { if (q->fileio) {
dprintk(1, "streamon: file io in progress\n"); dprintk(1, "streamon: file io in progress\n");
@ -1138,12 +1139,16 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type)
} }
} }
q->streaming = 1;
/* /*
* Let driver notice that streaming state has been enabled. * Let driver notice that streaming state has been enabled.
*/ */
call_qop(q, start_streaming, q); ret = call_qop(q, start_streaming, q);
if (ret) {
dprintk(1, "streamon: driver refused to start streaming\n");
return ret;
}
q->streaming = 1;
/* /*
* If any buffers were queued before streamon, * If any buffers were queued before streamon,