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

media: hackrf: 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>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fee248fb

drivers/media/usb/hackrf/hackrf.c

+2 −2
Original line number Diff line number Diff line
@@ -1398,6 +1398,7 @@ static int hackrf_probe(struct usb_interface *intf, 
	dev->rx_vb2_queue.drv_priv = dev;

	dev->rx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer);

	dev->rx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	dev->rx_vb2_queue.lock = &dev->vb_queue_lock;

	ret = vb2_queue_init(&dev->rx_vb2_queue);

	if (ret) {

		dev_err(dev->dev, "Could not initialize rx vb2 queue\n");
@@ -1413,6 +1414,7 @@ static int hackrf_probe(struct usb_interface *intf, 
	dev->tx_vb2_queue.drv_priv = dev;

	dev->tx_vb2_queue.buf_struct_size = sizeof(struct hackrf_buffer);

	dev->tx_vb2_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	dev->tx_vb2_queue.lock = &dev->vb_queue_lock;

	ret = vb2_queue_init(&dev->tx_vb2_queue);

	if (ret) {

		dev_err(dev->dev, "Could not initialize tx vb2 queue\n");
@@ -1474,7 +1476,6 @@ static int hackrf_probe(struct usb_interface *intf, 
	/* Init video_device structure for receiver */

	dev->rx_vdev = hackrf_template;

	dev->rx_vdev.queue = &dev->rx_vb2_queue;

	dev->rx_vdev.queue->lock = &dev->vb_queue_lock;

	dev->rx_vdev.v4l2_dev = &dev->v4l2_dev;

	dev->rx_vdev.ctrl_handler = &dev->rx_ctrl_handler;

	dev->rx_vdev.lock = &dev->v4l2_lock;
@@ -1494,7 +1495,6 @@ static int hackrf_probe(struct usb_interface *intf, 
	/* Init video_device structure for transmitter */

	dev->tx_vdev = hackrf_template;

	dev->tx_vdev.queue = &dev->tx_vb2_queue;

	dev->tx_vdev.queue->lock = &dev->vb_queue_lock;

	dev->tx_vdev.v4l2_dev = &dev->v4l2_dev;

	dev->tx_vdev.ctrl_handler = &dev->tx_ctrl_handler;

	dev->tx_vdev.lock = &dev->v4l2_lock;