Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
pci
/
saa7164
/
saa7164-encoder.c
diff --git
a/kernel/drivers/media/pci/saa7164/saa7164-encoder.c
b/kernel/drivers/media/pci/saa7164/saa7164-encoder.c
index
9266965
..
7a0a651
100644
(file)
--- a/
kernel/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/
kernel/drivers/media/pci/saa7164/saa7164-encoder.c
@@
-721,13
+721,14
@@
static int vidioc_querycap(struct file *file, void *priv,
sizeof(cap->card));
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
sizeof(cap->card));
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
- cap->
capabilitie
s =
+ cap->
device_cap
s =
V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_VIDEO_CAPTURE |
- V4L2_CAP_READWRITE
|
-
0
;
+ V4L2_CAP_READWRITE |
+
V4L2_CAP_TUNER
;
- cap->capabilities |= V4L2_CAP_TUNER;
- cap->version = 0;
+ cap->capabilities = cap->device_caps |
+ V4L2_CAP_VBI_CAPTURE |
+ V4L2_CAP_DEVICE_CAPS;
return 0;
}
return 0;
}