From 881f11576197da0ee894e0a67108cb9c2e3d9c67 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 21 Nov 2010 16:54:56 -0300 Subject: [PATCH] --- yaml --- r: 223395 b: refs/heads/master c: 673eb9ff33e26ee6f4278cdab06749aef1bbef5b h: refs/heads/master i: 223393: 9ac7f475d8acd132ba21a6e301708765ffaa825b 223391: bd6ba774b5f535a3b01c950bee74eb1feb8dc674 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c3b0575a8dc7..d6ed3c14252d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6947756dfcecc493062a46e77f6bf51dddb5be75 +refs/heads/master: 673eb9ff33e26ee6f4278cdab06749aef1bbef5b diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c index 2f6dc6b97348..8cf61e8a634f 100644 --- a/trunk/drivers/media/video/uvc/uvc_v4l2.c +++ b/trunk/drivers/media/video/uvc/uvc_v4l2.c @@ -1088,7 +1088,7 @@ const struct v4l2_file_operations uvc_fops = { .owner = THIS_MODULE, .open = uvc_v4l2_open, .release = uvc_v4l2_release, - .ioctl = uvc_v4l2_ioctl, + .unlocked_ioctl = uvc_v4l2_ioctl, .read = uvc_v4l2_read, .mmap = uvc_v4l2_mmap, .poll = uvc_v4l2_poll,