media: i2c: video-i2c: 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.
Fix the number of buffers computation at the same time.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
CC: Matt Ranostay <matt.ranostay@konsulko.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/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
index 178bd06cc2ed506c3e4aa74bd359dfcf66d3d189..ebf2ac98a0683704f49b6f5cecc3f2d39b203731 100644 (file)
--- a/drivers/media/i2c/video-i2c.c
+++ b/drivers/media/i2c/video-i2c.c
@@ -405,9 +405,10 @@ static int queue_setup(struct vb2_queue *vq,
 {
        struct video_i2c_data *data = vb2_get_drv_priv(vq);
        unsigned int size = data->chip->buffer_size;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2;
+       if (q_num_bufs + *nbuffers < 2)
+               *nbuffers = 2 - q_num_bufs;
 
        if (*nplanes)
                return sizes[0] < size ? -EINVAL : 0;