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: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index 1e30e05953dc647d31a4afcca562ae89767353e0..62a583040cd480f22e61759949972f86aba9735d 100644 (file)
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -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;