Commit 7dc866df authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array 



Use vb2_get_buffer() instead of direct access to the vb2_queue bufs array.
This allows us to change the type of the bufs in the future.
After each call to vb2_get_buffer() we need to be sure that we get
a valid pointer so check the return value of all of them.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 53963fb1

drivers/media/dvb-core/dvb_vb2.c

+8 −6
Original line number Diff line number Diff line
@@ -355,12 +355,13 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req) 
int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)

{

	struct vb2_queue *q = &ctx->vb_q;

	struct vb2_buffer *vb2 = vb2_get_buffer(q, b->index);



	if (b->index >= q->num_buffers) {

		dprintk(1, "[%s] buffer index out of range\n", ctx->name);

	if (!vb2) {

		dprintk(1, "[%s] invalid buffer index\n", ctx->name);

		return -EINVAL;

	}

	vb2_core_querybuf(&ctx->vb_q, q->bufs[b->index], b);

	vb2_core_querybuf(&ctx->vb_q, vb2, b);

	dprintk(3, "[%s] index=%d\n", ctx->name, b->index);

	return 0;

}
@@ -385,13 +386,14 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp) 
int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b)

{

	struct vb2_queue *q = &ctx->vb_q;

	struct vb2_buffer *vb2 = vb2_get_buffer(q, b->index);

	int ret;



	if (b->index >= q->num_buffers) {

		dprintk(1, "[%s] buffer index out of range\n", ctx->name);

	if (!vb2) {

		dprintk(1, "[%s] invalid buffer index\n", ctx->name);

		return -EINVAL;

	}

	ret = vb2_core_qbuf(&ctx->vb_q, q->bufs[b->index], b, NULL);

	ret = vb2_core_qbuf(&ctx->vb_q, vb2, b, NULL);

	if (ret) {

		dprintk(1, "[%s] index=%d errno=%d\n", ctx->name,

			b->index, ret);