summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2024-08-28 14:11:49 +0300
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2024-08-28 14:11:49 +0300
commit393556c9f56ced8d9776c32ce99f34913cfd904e (patch)
treec1df4490c5ac720013151dd9d24df4d617665ad6
parent07f518c0a7023ddf88b19e6d52117d7548044dfc (diff)
parente5700c9037727d5a69a677d6dba25010b485d65b (diff)
downloadlinux-393556c9f56ced8d9776c32ce99f34913cfd904e.tar.xz
Merge tag 'tags/next-media-videobuf-20240827' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git
- videobuf2 regression fix Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.linuxtv.org/project/linux-media/patch/20240827122125.GA17846@pendragon.ideasonboard.com/
-rw-r--r--drivers/media/common/videobuf2/videobuf2-core.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 500a4e0c84ab..29a8d876e6c2 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -2633,13 +2633,6 @@ int vb2_core_queue_init(struct vb2_queue *q)
return -EINVAL;
/*
- * The minimum requirement is 2: one buffer is used
- * by the hardware while the other is being processed by userspace.
- */
- if (q->min_reqbufs_allocation < 2)
- q->min_reqbufs_allocation = 2;
-
- /*
* If the driver needs 'min_queued_buffers' in the queue before
* calling start_streaming() then the minimum requirement is
* 'min_queued_buffers + 1' to keep at least one buffer available