From: Hans Verkuil <[email protected]> __qbuf_mmap was sort of hidden in between the much larger __qbuf_userptr and __qbuf_dmabuf functions. Move it before __qbuf_userptr which is also conform the usual order these memory models are implemented: first mmap, then userptr, then dmabuf.
Signed-off-by: Hans Verkuil <[email protected]> --- drivers/media/v4l2-core/videobuf2-core.c | 50 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 1f8ab7b..1dc1db8 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -1241,6 +1241,31 @@ static void __buf_finish_memory(struct vb2_buffer *vb) } /** + * __qbuf_mmap() - handle qbuf of an MMAP buffer + */ +static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) +{ + int ret; + + __fill_vb2_buffer(vb, b, vb->v4l2_planes); + + ret = __buf_prepare_memory(vb); + if (ret) { + call_vb_qop(vb, buf_cleanup, vb); + dprintk(1, "%s: buffer memory preparation failed\n", __func__); + return ret; + } + + ret = call_vb_qop(vb, buf_prepare, vb); + if (ret) { + dprintk(1, "%s: buffer preparation failed\n", __func__); + fail_vb_qop(vb, buf_prepare); + __buf_finish_memory(vb); + } + return ret; +} + +/** * __qbuf_userptr() - handle qbuf of a USERPTR buffer */ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b) @@ -1354,31 +1379,6 @@ err: } /** - * __qbuf_mmap() - handle qbuf of an MMAP buffer - */ -static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) -{ - int ret; - - __fill_vb2_buffer(vb, b, vb->v4l2_planes); - - ret = __buf_prepare_memory(vb); - if (ret) { - call_vb_qop(vb, buf_cleanup, vb); - dprintk(1, "%s: buffer memory preparation failed\n", __func__); - return ret; - } - - ret = call_vb_qop(vb, buf_prepare, vb); - if (ret) { - dprintk(1, "%s: buffer preparation failed\n", __func__); - fail_vb_qop(vb, buf_prepare); - __buf_finish_memory(vb); - } - return ret; -} - -/** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b) -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
