mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
media: rcar_drif.c: 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> Cc: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> Cc: Jacopo Mondi <jacopo.mondi@ideasonboard.com> 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
8d04fcc76f
commit
922b739445
@ -1071,7 +1071,6 @@ static int rcar_drif_sdr_register(struct rcar_drif_sdr *sdr)
|
||||
sdr->vdev->release = video_device_release;
|
||||
sdr->vdev->lock = &sdr->v4l2_mutex;
|
||||
sdr->vdev->queue = &sdr->vb_queue;
|
||||
sdr->vdev->queue->lock = &sdr->vb_queue_mutex;
|
||||
sdr->vdev->ctrl_handler = &sdr->ctrl_hdl;
|
||||
sdr->vdev->v4l2_dev = &sdr->v4l2_dev;
|
||||
sdr->vdev->device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER |
|
||||
@ -1316,6 +1315,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)
|
||||
sdr->vb_queue.ops = &rcar_drif_vb2_ops;
|
||||
sdr->vb_queue.mem_ops = &vb2_vmalloc_memops;
|
||||
sdr->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
sdr->vb_queue.lock = &sdr->vb_queue_mutex;
|
||||
|
||||
/* Init videobuf2 queue */
|
||||
ret = vb2_queue_init(&sdr->vb_queue);
|
||||
|
Loading…
Reference in New Issue
Block a user