Commit d1275e99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fix from Mauro Carvalho Chehab:
 "rtl2832 driver regression fix"

* tag 'media/v6.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: rtl2832_sdr: assign vb2 lock before vb2_queue_init
parents 0990528b d9e7c172

drivers/media/dvb-frontends/rtl2832_sdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1363,6 +1363,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev) 
	dev->vb_queue.ops = &rtl2832_sdr_vb2_ops;

	dev->vb_queue.mem_ops = &vb2_vmalloc_memops;

	dev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

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

	ret = vb2_queue_init(&dev->vb_queue);

	if (ret) {

		dev_err(&pdev->dev, "Could not initialize vb2 queue\n");
@@ -1421,7 +1422,6 @@ static int rtl2832_sdr_probe(struct platform_device *pdev) 
	/* Init video_device structure */

	dev->vdev = rtl2832_sdr_template;

	dev->vdev.queue = &dev->vb_queue;

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

	video_set_drvdata(&dev->vdev, dev);



	/* Register the v4l2_device structure */