projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.8' into patchwork
[linux-2.6-microblaze.git]
/
drivers
/
media
/
pci
/
saa7134
/
saa7134-empress.c
diff --git
a/drivers/media/pci/saa7134/saa7134-empress.c
b/drivers/media/pci/saa7134/saa7134-empress.c
index
b56b5f7
..
f0fe252
100644
(file)
--- a/
drivers/media/pci/saa7134/saa7134-empress.c
+++ b/
drivers/media/pci/saa7134/saa7134-empress.c
@@
-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;