This series fixes a few wait_prepare/finish issues (either missing altogether, or the lock field was set after the call to vb2_queue_init instead of before), and in the last two patches it adds a sanity check for the lock and implements a default version for wait_prepare/finish() if the driver does not supply those functions. With this in place most (all?) drivers that use vb2_ops_wait_prepare/finish can drop those functions and the end goal is to drop those ops altogether. Regards, Hans The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc: Linux 6.12-rc1 (2024-09-29 15:06:19 -0700) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.13b for you to fetch changes up to 3d882f3a391dbc10d53cfb647d469d68a62a1c5b: media: vb2: use lock if wait_prepare/finish are NULL (2024-10-02 11:53:42 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Hans Verkuil (11): media: omap3isp: add missing wait_prepare/finish ops media: pisp_be: add missing wait_prepare/finish ops media: venus: add missing wait_prepare/finish ops media: pwc: set lock before calling vb2_queue_init() media: msi2500: set lock before calling vb2_queue_init() media: hackrf: set lock before calling vb2_queue_init() media: airspy: set lock before calling vb2_queue_init() media: rcar_drif.c: set lock before calling vb2_queue_init() media: video-i2c: set lock before calling vb2_queue_init() media: vb2: vb2_core_queue_init(): sanity check lock and wait_prepare/finish media: vb2: use lock if wait_prepare/finish are NULL drivers/media/common/videobuf2/videobuf2-core.c | 21 ++++++++++++++++++--- drivers/media/i2c/video-i2c.c | 2 +- drivers/media/platform/qcom/venus/vdec.c | 2 ++ drivers/media/platform/qcom/venus/venc.c | 2 ++ drivers/media/platform/raspberrypi/pisp_be/pisp_be.c | 2 ++ drivers/media/platform/renesas/rcar_drif.c | 2 +- drivers/media/platform/ti/omap3isp/ispvideo.c | 18 ++++++++++++++++++ drivers/media/usb/airspy/airspy.c | 2 +- drivers/media/usb/hackrf/hackrf.c | 4 ++-- drivers/media/usb/msi2500/msi2500.c | 2 +- drivers/media/usb/pwc/pwc-if.c | 2 +- 11 files changed, 49 insertions(+), 10 deletions(-)