mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 20:24:12 +08:00
media: pwc: 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
547629f7b1
commit
3653f14841
@ -1054,6 +1054,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
|
||||
pdev->vb_queue.ops = &pwc_vb_queue_ops;
|
||||
pdev->vb_queue.mem_ops = &vb2_vmalloc_memops;
|
||||
pdev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
pdev->vb_queue.lock = &pdev->vb_queue_lock;
|
||||
rc = vb2_queue_init(&pdev->vb_queue);
|
||||
if (rc < 0) {
|
||||
PWC_ERROR("Oops, could not initialize vb2 queue.\n");
|
||||
@ -1064,7 +1065,6 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
|
||||
pdev->vdev = pwc_template;
|
||||
strscpy(pdev->vdev.name, name, sizeof(pdev->vdev.name));
|
||||
pdev->vdev.queue = &pdev->vb_queue;
|
||||
pdev->vdev.queue->lock = &pdev->vb_queue_lock;
|
||||
video_set_drvdata(&pdev->vdev, pdev);
|
||||
|
||||
pdev->release = le16_to_cpu(udev->descriptor.bcdDevice);
|
||||
|
Loading…
Reference in New Issue
Block a user