diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-01 12:14:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-01 12:14:22 +0100 |
| commit | 2dbd82149fa9038aa1de47432a80c56761243a1a (patch) | |
| tree | b66dd581dbe2e48ad132fa31775e0b7936af0853 /drivers/media | |
| parent | 92b425c4f1f9b97b9a93b5b38d12b865f46ce6b6 (diff) | |
| parent | c6ee9e74b237b01d0a4988de41acbf569fdb8974 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rt
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/videobuf2-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 0c1a42bf27fd..1c37d5a78822 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1366,6 +1366,11 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb) struct vb2_buffer *vb; int ret; + if (q->error) { + dprintk(1, "fatal error occurred on queue\n"); + return -EIO; + } + vb = q->bufs[index]; switch (vb->state) { |