summaryrefslogtreecommitdiffstats
path: root/samples/v4l
diff options
context:
space:
mode:
authorBenjamin Gaignard <benjamin.gaignard@collabora.com>2023-11-09 17:34:50 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-11-23 12:33:19 +0100
commit88d9ce34a6aa19620911c4e149d99d40307b9f72 (patch)
tree53b3e4d14051a34f94714e0c6fde5fa3938e07e0 /samples/v4l
parent11678528576e5e9ac857e0faa656fa2b00cda0d3 (diff)
downloadlinux-stable-88d9ce34a6aa19620911c4e149d99d40307b9f72.tar.gz
linux-stable-88d9ce34a6aa19620911c4e149d99d40307b9f72.tar.bz2
linux-stable-88d9ce34a6aa19620911c4e149d99d40307b9f72.zip
media: sample: v4l: 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>
Diffstat (limited to 'samples/v4l')
-rw-r--r--samples/v4l/v4l2-pci-skeleton.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index a61f94db18d9..a65aa9d1e9da 100644
--- a/samples/v4l/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c
@@ -155,6 +155,7 @@ static int queue_setup(struct vb2_queue *vq,
unsigned int sizes[], struct device *alloc_devs[])
{
struct skeleton *skel = vb2_get_drv_priv(vq);
+ unsigned int q_num_bufs = vb2_get_num_buffers(vq);
skel->field = skel->format.field;
if (skel->field == V4L2_FIELD_ALTERNATE) {
@@ -167,8 +168,8 @@ static int queue_setup(struct vb2_queue *vq,
skel->field = V4L2_FIELD_TOP;
}
- if (vq->num_buffers + *nbuffers < 3)
- *nbuffers = 3 - vq->num_buffers;
+ if (q_num_bufs + *nbuffers < 3)
+ *nbuffers = 3 - q_num_bufs;
if (*nplanes)
return sizes[0] < skel->format.sizeimage ? -EINVAL : 0;