Skip to content

Commit d8feef9

Browse files
hverkuilmchehab
authored andcommitted
[media] cx23885/saa7134: assign q->dev to the PCI device
Fix a regression caused by commit 2bc46b3 ("[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: 2bc46b3 ("[media] media/pci: convert drivers to use the new vb2_queue dev field"). Signed-off-by: Hans Verkuil <[email protected]> Reported-by: Marton Balint <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 7892a1f commit d8feef9

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,6 +1552,7 @@ int cx23885_417_register(struct cx23885_dev *dev)
15521552
q->mem_ops = &vb2_dma_sg_memops;
15531553
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
15541554
q->lock = &dev->lock;
1555+
q->dev = &dev->pci->dev;
15551556

15561557
err = vb2_queue_init(q);
15571558
if (err < 0)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,7 @@ static int dvb_init(struct saa7134_dev *dev)
12381238
q->buf_struct_size = sizeof(struct saa7134_buf);
12391239
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
12401240
q->lock = &dev->lock;
1241+
q->dev = &dev->pci->dev;
12411242
ret = vb2_queue_init(q);
12421243
if (ret) {
12431244
vb2_dvb_dealloc_frontends(&dev->frontends);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ static int empress_init(struct saa7134_dev *dev)
295295
q->buf_struct_size = sizeof(struct saa7134_buf);
296296
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
297297
q->lock = &dev->lock;
298+
q->dev = &dev->pci->dev;
298299
err = vb2_queue_init(q);
299300
if (err)
300301
return err;

0 commit comments

Comments
 (0)