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

media: media/pci: use vb2_video_unregister_device() 



Use vb2_video_unregister_device() to automatically stop streaming
at unregister time.

This avoids the use of vb2_queue_release() which should not be
called by drivers that set vdev->queue.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 492abcd7

drivers/media/pci/dt3155/dt3155.c

+1 −2
Original line number Diff line number Diff line
@@ -575,9 +575,8 @@ static void dt3155_remove(struct pci_dev *pdev) 
	struct dt3155_priv *pd = container_of(v4l2_dev, struct dt3155_priv,

					      v4l2_dev);



	video_unregister_device(&pd->vdev);

	vb2_video_unregister_device(&pd->vdev);

	free_irq(pd->pdev->irq, pd);

	vb2_queue_release(&pd->vidq);

	v4l2_device_unregister(&pd->v4l2_dev);

	pci_iounmap(pdev, pd->regs);

	pci_release_region(pdev, 0);

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+3 −6
Original line number Diff line number Diff line
@@ -1633,7 +1633,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q) 
	if (r) {

		dev_err(&cio2->pci_dev->dev,

			"failed to initialize videobuf2 queue (%d)\n", r);

		goto fail_vbq;

		goto fail_subdev;

	}



	/* Initialize vdev */
@@ -1664,10 +1664,8 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q) 
	return 0;



fail_link:

	video_unregister_device(&q->vdev);

	vb2_video_unregister_device(&q->vdev);

fail_vdev:

	vb2_queue_release(vbq);

fail_vbq:

	v4l2_device_unregister_subdev(subdev);

fail_subdev:

	media_entity_cleanup(&vdev->entity);
@@ -1683,9 +1681,8 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q) 


static void cio2_queue_exit(struct cio2_device *cio2, struct cio2_queue *q)

{

	video_unregister_device(&q->vdev);

	vb2_video_unregister_device(&q->vdev);

	media_entity_cleanup(&q->vdev.entity);

	vb2_queue_release(&q->vbq);

	v4l2_device_unregister_subdev(&q->subdev);

	media_entity_cleanup(&q->subdev.entity);

	cio2_fbpt_exit(q, &cio2->pci_dev->dev);

drivers/media/pci/saa7134/saa7134-core.c

+3 −3
Original line number Diff line number Diff line
@@ -965,21 +965,21 @@ static void saa7134_unregister_video(struct saa7134_dev *dev) 


	if (dev->video_dev) {

		if (video_is_registered(dev->video_dev))

			video_unregister_device(dev->video_dev);

			vb2_video_unregister_device(dev->video_dev);

		else

			video_device_release(dev->video_dev);

		dev->video_dev = NULL;

	}

	if (dev->vbi_dev) {

		if (video_is_registered(dev->vbi_dev))

			video_unregister_device(dev->vbi_dev);

			vb2_video_unregister_device(dev->vbi_dev);

		else

			video_device_release(dev->vbi_dev);

		dev->vbi_dev = NULL;

	}

	if (dev->radio_dev) {

		if (video_is_registered(dev->radio_dev))

			video_unregister_device(dev->radio_dev);

			vb2_video_unregister_device(dev->radio_dev);

		else

			video_device_release(dev->radio_dev);

		dev->radio_dev = NULL;

drivers/media/pci/saa7134/saa7134-empress.c

+1 −2
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ static int empress_fini(struct saa7134_dev *dev) 
	if (NULL == dev->empress_dev)

		return 0;

	flush_work(&dev->empress_workqueue);

	video_unregister_device(dev->empress_dev);

	vb2_queue_release(&dev->empress_vbq);

	vb2_video_unregister_device(dev->empress_dev);

	v4l2_ctrl_handler_free(&dev->empress_ctrl_handler);

	dev->empress_dev = NULL;

	return 0;

drivers/media/pci/saa7134/saa7134-go7007.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int saa7134_go7007_fini(struct saa7134_dev *dev) 
	free_page((unsigned long)saa->bottom);

	v4l2_device_unregister_subdev(&saa->sd);

	kfree(saa);

	video_unregister_device(&go->vdev);

	vb2_video_unregister_device(&go->vdev);



	v4l2_device_put(&go->v4l2_dev);

	dev->empress_dev = NULL;