diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-01-16 13:01:17 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-01-31 12:31:34 +0100 |
| commit | 1284ed59a147c27cb882e49213571f7d52976eb5 (patch) | |
| tree | 6fca1ee44674f77e5d207c64f89a0a18136befe0 /drivers | |
| parent | media: cedrus: add buf_out_validate callback (diff) | |
| download | linux-1284ed59a147c27cb882e49213571f7d52976eb5.tar.xz linux-1284ed59a147c27cb882e49213571f7d52976eb5.zip | |
media: vb2: check that buf_out_validate is present
The buf_out_validate is required for output queues in combination
with requests. Check this.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-v4l2.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 2f3b3ca5bde6..3aeaea3af42a 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -409,6 +409,15 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md */ if (WARN_ON(!q->ops->buf_request_complete)) return -EINVAL; + /* + * Make sure this op is implemented by the driver for the output queue. + * It's easy to forget this callback, but is it important to correctly + * validate the 'field' value at QBUF time. + */ + if (WARN_ON((q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT || + q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) && + !q->ops->buf_out_validate)) + return -EINVAL; if (vb->state != VB2_BUF_STATE_DEQUEUED) { dprintk(1, "%s: buffer is not in dequeued state\n", opname); |