diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-06 03:46:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-06 03:46:08 -0700 |
| commit | 3b8fc0b7a3fcc809378d82dbf66b417e186af205 (patch) | |
| tree | 6e44c44ec85ddba4faf8cb108b04c47cb3fc4414 /drivers/media | |
| parent | 8f037f0b363b3907444a3a46b90e293284c6da51 (diff) | |
| parent | d9a879450e01a53b297876072dfc1e541181862b (diff) | |
Merge "Merge android-4.4.158 (f9e4134) into msm-4.4"
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) { |