dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 11:02:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

v4l2: omit wait_prepare/finish callbacks from vb2_ops for kernels >= 7.0

Browse Source 
v7.0-rc1 commit b70886ff5833 ("media: vb2: drop wait_prepare/finish
callbacks") has removed wait_prepare/wait_finish fields from struct
vb2_ops, which fails the build with following errors:

    CC [M]  fthd_v4l2.o
  fthd_v4l2.c:306:10: error: ‘struct vb2_ops’ has no member named ‘wait_prepare’; did you mean ‘buf_prepare’?
    306 |         .wait_prepare           = vb2_ops_wait_prepare,
        |          ^~~~~~~~~~~~
        |          buf_prepare
  fthd_v4l2.c:306:35: error: ‘vb2_ops_wait_prepare’ undeclared here (not in a function)
    306 |         .wait_prepare           = vb2_ops_wait_prepare,
        |                                   ^~~~~~~~~~~~~~~~~~~~
  fthd_v4l2.c:307:10: error: ‘struct vb2_ops’ has no member named ‘wait_finish’
    307 |         .wait_finish            = vb2_ops_wait_finish,
        |          ^~~~~~~~~~~
  fthd_v4l2.c:307:35: error: ‘vb2_ops_wait_finish’ undeclared here (not in a function)
    307 |         .wait_finish            = vb2_ops_wait_finish,
        |                                   ^~~~~~~~~~~~~~~~~~~
  fthd_v4l2.c:307:35: warning: excess elements in struct initializer
  fthd_v4l2.c:307:35: note: (near initialization for ‘vb2_queue_ops’)
  make[3]: *** [/usr/src/linux-headers-7.0.0-3-generic/scripts/Makefile.build:289: fthd_v4l2.o] Error 1

Closes: #319
Signed-off-by: You-Sheng Yang <vicamo@gmail.com>
This commit is contained in:
You-Sheng Yang
2026-03-03 00:20:04 +08:00
parent 1bd87461d3
commit 45572a4b29
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fthd_v4l2.c
View File

@@ -303,8 +303,10 @@ static struct vb2_ops vb2_queue_ops = {
.start_streaming = fthd_start_streaming,
.stop_streaming = fthd_stop_streaming,
.buf_queue = fthd_buffer_queue,
#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
#endif
};
static struct v4l2_file_operations fthd_vdev_fops = {