diff options
| author | Martin Rubli <martin_rubli@logitech.com> | 2010-09-08 04:15:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:18:22 -0200 |
| commit | 8fb91b33c6bfa3ac5e4ad76920b7bcd7bdbbb6d0 (patch) | |
| tree | c7e33ca829580a6a8d8f8808c4b860cf12a2cbca /drivers/media/video/uvc/uvc_driver.c | |
| parent | ba2fa99668bb9bf03757a020f15bba295d5c0a3e (diff) | |
[media] uvcvideo: Remove sysadmin requirements for UVCIOC_CTRL_MAP
This patch removes the sysadmin requirements for UVCIOC_CTRL_MAP (and the stub
implementation of UVCIOC_CTRL_ADD). This requirement no longer makes sense with
the new XU control access mechanisms since XU controls can be accessed without
adding control mappings first.
A maximum number (currently 1024) of control mappings per device is enforced to
avoid excess memory consumption caused by careless user space applications.
Signed-off-by: Martin Rubli <martin_rubli@logitech.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_driver.c')
| -rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 71efda76cc7..a1e9dfb52f6 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c @@ -1760,6 +1760,7 @@ static int uvc_probe(struct usb_interface *intf, INIT_LIST_HEAD(&dev->streams); atomic_set(&dev->nstreams, 0); atomic_set(&dev->users, 0); + atomic_set(&dev->nmappings, 0); dev->udev = usb_get_dev(udev); dev->intf = usb_get_intf(intf); |