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

media: video-i2c: 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>
Acked-by: default avatarMatt Ranostay <matt@ranostay.sg>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 922b7394

drivers/media/i2c/video-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -798,13 +798,13 @@ static int video_i2c_probe(struct i2c_client *client) 
	queue->min_queued_buffers = 1;

	queue->ops = &video_i2c_video_qops;

	queue->mem_ops = &vb2_vmalloc_memops;

	queue->lock = &data->queue_lock;



	ret = vb2_queue_init(queue);

	if (ret < 0)

		goto error_unregister_device;



	data->vdev.queue = queue;

	data->vdev.queue->lock = &data->queue_lock;



	snprintf(data->vdev.name, sizeof(data->vdev.name),

				 "I2C %d-%d Transport Video",