Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf3c31a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: call buf_finish after the state check 



Don't call buf_finish unless we know that the buffer is in a valid state.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3f1a9a33

drivers/media/v4l2-core/videobuf2-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1929,8 +1929,6 @@ static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool n 
	if (ret < 0)

		return ret;



	call_vb_qop(vb, buf_finish, vb);



	switch (vb->state) {

	case VB2_BUF_STATE_DONE:

		dprintk(3, "dqbuf: Returning done buffer\n");
@@ -1943,6 +1941,8 @@ static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool n 
		return -EINVAL;

	}



	call_vb_qop(vb, buf_finish, vb);



	/* Fill buffer information for the userspace */

	__fill_v4l2_buffer(vb, b);

	/* Remove from videobuf queue */