media: atomisp: 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>
Link: https://lore.kernel.org/r/90b8e7a40c3ed306cbeb96c2f4dad97eb7e53bfd.1725285495.git.hverkuil-cisco@xs4all.nl
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
index 3a3e84a035e262c7bd8710f6952ba55bd92c834d..202497695e46fbe9621a5086a3cfaa0f5c1e965d 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
@@ -797,12 +797,12 @@ static int atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,
        pipe->vb_queue.ops = &atomisp_vb2_ops;
        pipe->vb_queue.mem_ops = &vb2_vmalloc_memops;
        pipe->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+       pipe->vb_queue.lock = &pipe->vb_queue_mutex;
        ret = vb2_queue_init(&pipe->vb_queue);
        if (ret)
                return ret;
 
        pipe->vdev.queue = &pipe->vb_queue;
-       pipe->vdev.queue->lock = &pipe->vb_queue_mutex;
 
        INIT_LIST_HEAD(&pipe->buffers_in_css);
        INIT_LIST_HEAD(&pipe->activeq);