Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] cx23885/saa7134: assign q->dev to the PCI device 



Fix a regression caused by commit 2bc46b3a ("[media] media/pci:
convert drivers to use the new vb2_queue dev field").

Three places where q->dev should be set were missed, causing
a WARN.

Fixes: 2bc46b3a ("[media] media/pci: convert drivers to use the new vb2_queue dev field").

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarMarton Balint <cus@passwd.hu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 7892a1f6

drivers/media/pci/cx23885/cx23885-417.c

+1 −0
Original line number Diff line number Diff line
@@ -1552,6 +1552,7 @@ int cx23885_417_register(struct cx23885_dev *dev) 
	q->mem_ops = &vb2_dma_sg_memops;

	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	q->lock = &dev->lock;

	q->dev = &dev->pci->dev;



	err = vb2_queue_init(q);

	if (err < 0)

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

+1 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,7 @@ static int dvb_init(struct saa7134_dev *dev) 
	q->buf_struct_size = sizeof(struct saa7134_buf);

	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	q->lock = &dev->lock;

	q->dev = &dev->pci->dev;

	ret = vb2_queue_init(q);

	if (ret) {

		vb2_dvb_dealloc_frontends(&dev->frontends);

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

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ static int empress_init(struct saa7134_dev *dev) 
	q->buf_struct_size = sizeof(struct saa7134_buf);

	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	q->lock = &dev->lock;

	q->dev = &dev->pci->dev;

	err = vb2_queue_init(q);

	if (err)

		return err;