Commit 4545ca51 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: usb: usbtv: Stop direct calls to queue num_buffers field 



Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.

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 7e17d44d

drivers/media/usb/usbtv/usbtv-video.c

+3 −2
Original line number Diff line number Diff line
@@ -726,9 +726,10 @@ static int usbtv_queue_setup(struct vb2_queue *vq, 
{

	struct usbtv *usbtv = vb2_get_drv_priv(vq);

	unsigned size = USBTV_CHUNK * usbtv->n_chunks * 2 * sizeof(u32);

	unsigned int q_num_bufs = vb2_get_num_buffers(vq);



	if (vq->num_buffers + *nbuffers < 2)

		*nbuffers = 2 - vq->num_buffers;

	if (q_num_bufs + *nbuffers < 2)

		*nbuffers = 2 - q_num_bufs;

	if (*nplanes)

		return sizes[0] < size ? -EINVAL : 0;

	*nplanes = 1;