]> Pileus Git - ~andy/linux/commitdiff
[media] uvcvideo: Convert to unlocked_ioctl
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Sun, 21 Nov 2010 19:54:56 +0000 (16:54 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 1 Dec 2010 22:10:25 +0000 (20:10 -0200)
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>
drivers/media/video/uvc/uvc_v4l2.c

index 2f6dc6b973480ecd1b0f88e1b78c81b82fc84499..8cf61e8a634ffeb7cb23bfe004efc2c60053f1e8 100644 (file)
@@ -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,