diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-01-29 08:59:23 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-01-29 08:59:23 +0100 |
| commit | c8282f7b8523a4d37e5fefa220d93f2be06650e2 (patch) | |
| tree | 6ec17a2ea545b174dc903f6135f5b6258a1c4e2e /drivers/media/common/videobuf2/videobuf2-core.c | |
| parent | 04447d48afd365a837e23cde631517f166045b9d (diff) | |
| parent | 41bccc98fb7931d63d03f326a746ac4d429c1dd3 (diff) | |
| download | linux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.tar.gz linux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.tar.bz2 linux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.zip | |
Merge tag 'v6.8-rc2'
Linux 6.8-rc2
The vb2 fixes from v6.8-rc2 are needed for the work on the new
vb2 delete buffers feature.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/common/videobuf2/videobuf2-core.c')
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 41a832dd1426..b6bf8f232f48 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -989,7 +989,7 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, bool no_previous_buffers = !q_num_bufs; int ret = 0; - if (q->num_buffers == q->max_num_buffers) { + if (q_num_bufs == q->max_num_buffers) { dprintk(q, 1, "maximum number of buffers already allocated\n"); return -ENOBUFS; } |