diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-08-28 19:29:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-28 07:29:07 -0500 |
commit | 0550513c7a559b4933c5e1d47fbd15d15f6078d5 (patch) | |
tree | 923eee429a958c8c765db34008d9b83a47776f0e /drivers/media/usb/uvc/uvc_driver.c | |
parent | 69d11262a3ff4c07e071523e6768ec15ccc147c1 (diff) |
[media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_driver.c')
-rw-r--r-- | drivers/media/usb/uvc/uvc_driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index ae24f7d70b03..22f14d286fbb 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c | |||
@@ -1562,6 +1562,7 @@ static int uvc_scan_device(struct uvc_device *dev) | |||
1562 | INIT_LIST_HEAD(&chain->entities); | 1562 | INIT_LIST_HEAD(&chain->entities); |
1563 | mutex_init(&chain->ctrl_mutex); | 1563 | mutex_init(&chain->ctrl_mutex); |
1564 | chain->dev = dev; | 1564 | chain->dev = dev; |
1565 | v4l2_prio_init(&chain->prio); | ||
1565 | 1566 | ||
1566 | if (uvc_scan_chain(chain, term) < 0) { | 1567 | if (uvc_scan_chain(chain, term) < 0) { |
1567 | kfree(chain); | 1568 | kfree(chain); |
@@ -1722,6 +1723,8 @@ static int uvc_register_video(struct uvc_device *dev, | |||
1722 | vdev->v4l2_dev = &dev->vdev; | 1723 | vdev->v4l2_dev = &dev->vdev; |
1723 | vdev->fops = &uvc_fops; | 1724 | vdev->fops = &uvc_fops; |
1724 | vdev->release = uvc_release; | 1725 | vdev->release = uvc_release; |
1726 | vdev->prio = &stream->chain->prio; | ||
1727 | set_bit(V4L2_FL_USE_FH_PRIO, &vdev->flags); | ||
1725 | if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) | 1728 | if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) |
1726 | vdev->vfl_dir = VFL_DIR_TX; | 1729 | vdev->vfl_dir = VFL_DIR_TX; |
1727 | strlcpy(vdev->name, dev->name, sizeof vdev->name); | 1730 | strlcpy(vdev->name, dev->name, sizeof vdev->name); |