diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-11-21 14:54:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-01 17:10:25 -0500 |
commit | 673eb9ff33e26ee6f4278cdab06749aef1bbef5b (patch) | |
tree | 01b5ab03eade9f59e5dda39353f707946b188fe1 /drivers | |
parent | 6947756dfcecc493062a46e77f6bf51dddb5be75 (diff) |
[media] uvcvideo: Convert to unlocked_ioctl
The uvcvideo driver now locks all ioctls correctly on its own, the BKL
isn't needed anymore.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/uvc/uvc_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 2f6dc6b97348..8cf61e8a634f 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
@@ -1088,7 +1088,7 @@ const struct v4l2_file_operations uvc_fops = { | |||
1088 | .owner = THIS_MODULE, | 1088 | .owner = THIS_MODULE, |
1089 | .open = uvc_v4l2_open, | 1089 | .open = uvc_v4l2_open, |
1090 | .release = uvc_v4l2_release, | 1090 | .release = uvc_v4l2_release, |
1091 | .ioctl = uvc_v4l2_ioctl, | 1091 | .unlocked_ioctl = uvc_v4l2_ioctl, |
1092 | .read = uvc_v4l2_read, | 1092 | .read = uvc_v4l2_read, |
1093 | .mmap = uvc_v4l2_mmap, | 1093 | .mmap = uvc_v4l2_mmap, |
1094 | .poll = uvc_v4l2_poll, | 1094 | .poll = uvc_v4l2_poll, |