diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2016-03-01 09:57:24 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-04-13 15:41:31 -0400 |
| commit | 3e43cb33f637d77405ccddc81a6d76acd57ff71c (patch) | |
| tree | 3743521c369333d1e9d3f255a135ac33d9041c9d /Documentation/video4linux/v4l2-pci-skeleton.c | |
| parent | 7bbe7813290df9fda0c175b7a703325720594912 (diff) | |
[media] v4l2-pci-skeleton.c: fill in device_caps in video_device
With the new core support for the caps the driver no longer needs
to set device_caps and capabilities in the querycap call.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'Documentation/video4linux/v4l2-pci-skeleton.c')
| -rw-r--r-- | Documentation/video4linux/v4l2-pci-skeleton.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/Documentation/video4linux/v4l2-pci-skeleton.c index 79af0c041056..a55cf94ac907 100644 --- a/Documentation/video4linux/v4l2-pci-skeleton.c +++ b/Documentation/video4linux/v4l2-pci-skeleton.c | |||
| @@ -308,9 +308,6 @@ static int skeleton_querycap(struct file *file, void *priv, | |||
| 308 | strlcpy(cap->card, "V4L2 PCI Skeleton", sizeof(cap->card)); | 308 | strlcpy(cap->card, "V4L2 PCI Skeleton", sizeof(cap->card)); |
| 309 | snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", | 309 | snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", |
| 310 | pci_name(skel->pdev)); | 310 | pci_name(skel->pdev)); |
| 311 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | | ||
| 312 | V4L2_CAP_STREAMING; | ||
| 313 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | ||
| 314 | return 0; | 311 | return 0; |
| 315 | } | 312 | } |
| 316 | 313 | ||
| @@ -872,6 +869,8 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 872 | vdev->release = video_device_release_empty; | 869 | vdev->release = video_device_release_empty; |
| 873 | vdev->fops = &skel_fops, | 870 | vdev->fops = &skel_fops, |
| 874 | vdev->ioctl_ops = &skel_ioctl_ops, | 871 | vdev->ioctl_ops = &skel_ioctl_ops, |
| 872 | vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | | ||
| 873 | V4L2_CAP_STREAMING; | ||
| 875 | /* | 874 | /* |
| 876 | * The main serialization lock. All ioctls are serialized by this | 875 | * The main serialization lock. All ioctls are serialized by this |
| 877 | * lock. Exception: if q->lock is set, then the streaming ioctls | 876 | * lock. Exception: if q->lock is set, then the streaming ioctls |