mirror of
https://github.com/torvalds/linux.git
synced 2026-10-10 12:28:02 +02:00
media: airspy: set lock before calling vb2_queue_init()
The vb2_queue_init() will expect the vb2_queue lock pointer to be set in the future. So for those drivers that set the lock later, move it up to before the vb2_queue_init() call. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
cf78f3d3a6
commit
8d04fcc76f
|
|
@ -1017,6 +1017,7 @@ static int airspy_probe(struct usb_interface *intf,
|
|||
s->vb_queue.ops = &airspy_vb2_ops;
|
||||
s->vb_queue.mem_ops = &vb2_vmalloc_memops;
|
||||
s->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
s->vb_queue.lock = &s->vb_queue_lock;
|
||||
ret = vb2_queue_init(&s->vb_queue);
|
||||
if (ret) {
|
||||
dev_err(s->dev, "Could not initialize vb2 queue\n");
|
||||
|
|
@ -1026,7 +1027,6 @@ static int airspy_probe(struct usb_interface *intf,
|
|||
/* Init video_device structure */
|
||||
s->vdev = airspy_template;
|
||||
s->vdev.queue = &s->vb_queue;
|
||||
s->vdev.queue->lock = &s->vb_queue_lock;
|
||||
video_set_drvdata(&s->vdev, s);
|
||||
|
||||
/* Register the v4l2_device structure */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user