]> www.infradead.org Git - users/willy/pagecache.git/commit
media: rtl2832_sdr: assign vb2 lock before vb2_queue_init
authorHans Verkuil <hverkuil@xs4all.nl>
Mon, 24 Feb 2025 14:40:58 +0000 (15:40 +0100)
committerHans Verkuil <hverkuil@xs4all.nl>
Wed, 12 Mar 2025 15:43:51 +0000 (16:43 +0100)
commitd9e7c172a7f247f7ef0b151fa8c8f044b6a2a070
tree4d28d2839e79d0c7f1180f6c4a04a5477c0dcda6
parent2014c95afecee3e76ca4a56956a936e23283f05b
media: rtl2832_sdr: assign vb2 lock before vb2_queue_init

Commit c780d01cf1a6 ("media: vb2: vb2_core_queue_init(): sanity check lock
and wait_prepare/finish") added a sanity check to ensure that if there are
no wait_prepare/finish callbacks set by the driver, then the vb2_queue lock
must be set, since otherwise the vb2 core cannot do correct locking.

The rtl2832_sdr.c triggered this warning: it turns out that while the
driver does set this lock, it sets it too late. So move it up to before
the vb2_queue_init() call.

Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
Closes: https://lore.kernel.org/linux-media/20241211042355.8479-1-user@am64/
Fixes: 8fcd2795d22a ("media: rtl2832_sdr: drop vb2_ops_wait_prepare/finish")
Cc: stable@vger.kernel.org
Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
drivers/media/dvb-frontends/rtl2832_sdr.c