diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-11-21 16:54:56 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-01 20:10:25 -0200 |
commit | 673eb9ff33e26ee6f4278cdab06749aef1bbef5b (patch) | |
tree | 01b5ab03eade9f59e5dda39353f707946b188fe1 /drivers/media/video/uvc | |
parent | 6947756dfcecc493062a46e77f6bf51dddb5be75 (diff) | |
download | op-kernel-dev-673eb9ff33e26ee6f4278cdab06749aef1bbef5b.zip op-kernel-dev-673eb9ff33e26ee6f4278cdab06749aef1bbef5b.tar.gz |
[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/media/video/uvc')
-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 2f6dc6b..8cf61e8 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 = { .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, |