Commit b36c41c5 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://lore.kernel.org/r/90b8e7a40c3ed306cbeb96c2f4dad97eb7e53bfd.1725285495.git.hverkuil-cisco@xs4all.nl


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 92eb5226

drivers/staging/media/atomisp/pci/atomisp_subdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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);