summaryrefslogtreecommitdiff
path: root/drivers/media/video/pwc
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-05-14 14:32:48 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 18:06:50 (GMT)
commit152a3a7320d1582009db85d8be365ce430d079af (patch)
tree4ce91bc49ef493ce0299dd43c09f725b04ec567d /drivers/media/video/pwc
parent47bd4bc1a2624939c9f4ba154a2c18abe9d6c614 (diff)
downloadlinux-152a3a7320d1582009db85d8be365ce430d079af.tar.xz
[media] v4l2-dev: rename two functions
Rename the function v4l2_dont_use_lock to v4l2_disable_ioctl_locking, and rename v4l2_dont_use_cmd to v4l2_disable_ioctl. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc')
-rw-r--r--drivers/media/video/pwc/pwc-if.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 998e809..ec4e2ef 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1195,9 +1195,9 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
* v4l2_lock is taken for a long time, e.g. when changing a control
* value, and a new frame is ready to be dequeued.
*/
- v4l2_dont_use_lock(&pdev->vdev, VIDIOC_DQBUF);
- v4l2_dont_use_lock(&pdev->vdev, VIDIOC_QBUF);
- v4l2_dont_use_lock(&pdev->vdev, VIDIOC_QUERYBUF);
+ v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_DQBUF);
+ v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_QBUF);
+ v4l2_disable_ioctl_locking(&pdev->vdev, VIDIOC_QUERYBUF);
rc = video_register_device(&pdev->vdev, VFL_TYPE_GRABBER, -1);
if (rc < 0) {